Merge branch 'akpm' (patches from Andrew)

[sfrench/cifs-2.6.git] / arch / sparc / mm / srmmu.c

diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c
index b7c94de70ccac87bdb31f4c4366b86b9ac281df3..e9f7af32da0772f979cde5c212252ca7873ee919 100644 (file)
--- a/arch/sparc/mm/srmmu.c
+++ b/arch/sparc/mm/srmmu.c
@@ -333,7 +333,7 @@ static void __init srmmu_nocache_init(void)
                pgd = pgd_offset_k(vaddr);
                p4d = p4d_offset(__nocache_fix(pgd), vaddr);
                pud = pud_offset(__nocache_fix(p4d), vaddr);
-               pmd = pmd_offset(__nocache_fix(pgd), vaddr);
+               pmd = pmd_offset(__nocache_fix(pud), vaddr);
                pte = pte_offset_kernel(__nocache_fix(pmd), vaddr);
 
                pteval = ((paddr >> 4) | SRMMU_ET_PTE | SRMMU_PRIV);