powerpc: Replace find_linux_pte with find_linux_pte_or_hugepte

[karo-tx-linux.git] / arch / powerpc / kernel / eeh.c

diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c
index 7c567be3dd033aec3070004525951746947f033f..af2b9ae07df5a1703a36324f7147135570f68039 100644 (file)
--- a/arch/powerpc/kernel/eeh.c
+++ b/arch/powerpc/kernel/eeh.c
@@ -260,10 +260,15 @@ static inline unsigned long eeh_token_to_phys(unsigned long token)
 {
        pte_t *ptep;
        unsigned long pa;
+       int hugepage_shift;
 
-       ptep = find_linux_pte(init_mm.pgd, token);
+       /*
+        * We won't find hugepages here, iomem
+        */
+       ptep = find_linux_pte_or_hugepte(init_mm.pgd, token, &hugepage_shift);
        if (!ptep)
                return token;
+       WARN_ON(hugepage_shift);
        pa = pte_pfn(*ptep) << PAGE_SHIFT;
 
        return pa | (token & (PAGE_SIZE-1));