commit c6e8b587718c486b55c2ebecc6de231a30beba35
author Ralf Baechle <ralf@linux-mips.org> Thu Feb 10 12:19:59 2005 +0000
committer Ralf Baechle <ralf@linux-mips.org> Sat Oct 29 19:30:31 2005 +0100
tree 7c6162d449c69fb6425bd27ba341e2d874fb0a1b
parent 57f0060b8a2bb2a70a4cce1a37d5e0158cea92a6

Update MIPS to use the 4-level pagetable code thereby getting rid of
the compacrapability headers.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

arch/mips/mm/fault.c

diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c
index ec8077c..345a4d6 100644
--- a/arch/mips/mm/fault.c
+++ b/arch/mips/mm/fault.c
@@ -212,6 +212,7 @@
 		 */
 		int offset = __pgd_offset(address);
 		pgd_t *pgd, *pgd_k;
+		pud_t *pud, *pud_k;
 		pmd_t *pmd, *pmd_k;
 		pte_t *pte_k;
 
@@ -222,8 +223,13 @@
 			goto no_context;
 		set_pgd(pgd, *pgd_k);
 
-		pmd = pmd_offset(pgd, address);
-		pmd_k = pmd_offset(pgd_k, address);
+		pud = pud_offset(pgd, address);
+		pud_k = pud_offset(pgd_k, address);
+		if (!pud_present(*pud_k))
+			goto no_context;
+
+		pmd = pmd_offset(pud, address);
+		pmd_k = pmd_offset(pud_k, address);
 		if (!pmd_present(*pmd_k))
 			goto no_context;
 		set_pmd(pmd, *pmd_k);