Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6

[pandora-kernel.git] / arch / x86_64 / mm / fault.c

diff --git a/arch/x86_64/mm/fault.c b/arch/x86_64/mm/fault.c
index 3ae3e7b..1a17b07 100644 (file)
--- a/arch/x86_64/mm/fault.c
+++ b/arch/x86_64/mm/fault.c
@@ -293,7 +293,7 @@ static int vmalloc_fault(unsigned long address)
        if (pgd_none(*pgd))
                set_pgd(pgd, *pgd_ref);
        else
-               BUG_ON(pgd_page(*pgd) != pgd_page(*pgd_ref));
+               BUG_ON(pgd_page_vaddr(*pgd) != pgd_page_vaddr(*pgd_ref));
 
        /* Below here mismatches are bugs because these lower tables
           are shared */
@@ -302,7 +302,7 @@ static int vmalloc_fault(unsigned long address)
        pud_ref = pud_offset(pgd_ref, address);
        if (pud_none(*pud_ref))
                return -1;
-       if (pud_none(*pud) || pud_page(*pud) != pud_page(*pud_ref))
+       if (pud_none(*pud) || pud_page_vaddr(*pud) != pud_page_vaddr(*pud_ref))
                BUG();
        pmd = pmd_offset(pud, address);
        pmd_ref = pmd_offset(pud_ref, address);
@@ -635,7 +635,7 @@ void vmalloc_sync_all(void)
                                if (pgd_none(*pgd))
                                        set_pgd(pgd, *pgd_ref);
                                else
-                                       BUG_ON(pgd_page(*pgd) != pgd_page(*pgd_ref));
+                                       BUG_ON(pgd_page_vaddr(*pgd) != pgd_page_vaddr(*pgd_ref));
                        }
                        spin_unlock(&pgd_lock);
                        set_bit(pgd_index(address), insync);