projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'xtensa-20151108' of git://github.com/czankel/xtensa-linux
[firefly-linux-kernel-4.4.55.git]
/
arch
/
powerpc
/
kernel
/
io-workarounds.c
diff --git
a/arch/powerpc/kernel/io-workarounds.c
b/arch/powerpc/kernel/io-workarounds.c
index 63d9cc4d7366adfa674b2ff7917d698c6ff2a380..5f8613ceb97f15532378f48243fc1fc02e492a8b 100644
(file)
--- a/
arch/powerpc/kernel/io-workarounds.c
+++ b/
arch/powerpc/kernel/io-workarounds.c
@@
-76,7
+76,7
@@
struct iowa_bus *iowa_mem_find_bus(const PCI_IO_ADDR addr)
* a page table free due to init_mm
*/
ptep = __find_linux_pte_or_hugepte(init_mm.pgd, vaddr,
- &hugepage_shift);
+
NULL,
&hugepage_shift);
if (ptep == NULL)
paddr = 0;
else {