Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[linux-2.6] / arch / powerpc / mm / ppc_mmu_32.c

diff --git a/arch/powerpc/mm/ppc_mmu_32.c b/arch/powerpc/mm/ppc_mmu_32.c
index d137abd241ff09dc0c7c520794c13b1c24016269..ed7fcfe5fd370882d2264bd3e86ed04b9cbc74aa 100644 (file)
--- a/arch/powerpc/mm/ppc_mmu_32.c
+++ b/arch/powerpc/mm/ppc_mmu_32.c
@@ -188,9 +188,9 @@ void hash_preload(struct mm_struct *mm, unsigned long ea,
 
        if (Hash == 0)
                return;
-       pmd = pmd_offset(pgd_offset(vma->vm_mm, address), address);
+       pmd = pmd_offset(pgd_offset(mm, ea), ea);
        if (!pmd_none(*pmd))
-               add_hash_page(vma->vm_mm->context, address, pmd_val(*pmd));
+               add_hash_page(mm->context, ea, pmd_val(*pmd));
 }
 
 /*