diff options
Diffstat (limited to 'arch/powerpc/kernel/io-workarounds.c')
-rw-r--r-- | arch/powerpc/kernel/io-workarounds.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/powerpc/kernel/io-workarounds.c b/arch/powerpc/kernel/io-workarounds.c index 24b968f8e4d8..63d9cc4d7366 100644 --- a/arch/powerpc/kernel/io-workarounds.c +++ b/arch/powerpc/kernel/io-workarounds.c | |||
@@ -71,15 +71,15 @@ struct iowa_bus *iowa_mem_find_bus(const PCI_IO_ADDR addr) | |||
71 | vaddr = (unsigned long)PCI_FIX_ADDR(addr); | 71 | vaddr = (unsigned long)PCI_FIX_ADDR(addr); |
72 | if (vaddr < PHB_IO_BASE || vaddr >= PHB_IO_END) | 72 | if (vaddr < PHB_IO_BASE || vaddr >= PHB_IO_END) |
73 | return NULL; | 73 | return NULL; |
74 | 74 | /* | |
75 | ptep = find_linux_pte_or_hugepte(init_mm.pgd, vaddr, | 75 | * We won't find huge pages here (iomem). Also can't hit |
76 | * a page table free due to init_mm | ||
77 | */ | ||
78 | ptep = __find_linux_pte_or_hugepte(init_mm.pgd, vaddr, | ||
76 | &hugepage_shift); | 79 | &hugepage_shift); |
77 | if (ptep == NULL) | 80 | if (ptep == NULL) |
78 | paddr = 0; | 81 | paddr = 0; |
79 | else { | 82 | else { |
80 | /* | ||
81 | * we don't have hugepages backing iomem | ||
82 | */ | ||
83 | WARN_ON(hugepage_shift); | 83 | WARN_ON(hugepage_shift); |
84 | paddr = pte_pfn(*ptep) << PAGE_SHIFT; | 84 | paddr = pte_pfn(*ptep) << PAGE_SHIFT; |
85 | } | 85 | } |