commit f8a85f1164a33e3eb5b421b137ced793ed53ee33
author Russell King <rmk+kernel@arm.linux.org.uk> Fri Dec 18 16:23:44 2009 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> Wed Jan 20 13:48:29 2010 +0000
tree ce4cd8de4eeee853c87b41a594979fd9cb3b6db5
parent c26c20b823d48addbde9cb5709d80655c6fadf18

ARM: make_coherent: convert adjust_pte() to use p*d_none_or_clear_bad()

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

arch/arm/mm/fault-armv.c

diff --git a/arch/arm/mm/fault-armv.c b/arch/arm/mm/fault-armv.c
index 074e6bb5..7a8efe1 100644
--- a/arch/arm/mm/fault-armv.c
+++ b/arch/arm/mm/fault-armv.c
@@ -73,16 +73,12 @@
 	int ret;
 
 	pgd = pgd_offset(vma->vm_mm, address);
-	if (pgd_none(*pgd))
-		goto no_pgd;
-	if (pgd_bad(*pgd))
-		goto bad_pgd;
+	if (pgd_none_or_clear_bad(pgd))
+		return 0;
 
 	pmd = pmd_offset(pgd, address);
-	if (pmd_none(*pmd))
-		goto no_pmd;
-	if (pmd_bad(*pmd))
-		goto bad_pmd;
+	if (pmd_none_or_clear_bad(pmd))
+		return 0;
 
 	pte = pte_offset_map(pmd, address);
 
@@ -91,18 +87,6 @@
 	pte_unmap(pte);
 
 	return ret;
-
-bad_pgd:
-	pgd_ERROR(*pgd);
-	pgd_clear(pgd);
-no_pgd:
-	return 0;
-
-bad_pmd:
-	pmd_ERROR(*pmd);
-	pmd_clear(pmd);
-no_pmd:
-	return 0;
 }
 
 static void