From 85b6296707fd72f13f31b466e08ac95ecb6c5673 Mon Sep 17 00:00:00 2001
From: Steve Capper <steve.capper@linaro.org>
Date: Fri, 19 Apr 2013 15:49:31 +0100
Subject: [PATCH] --- yaml --- r: 367258 b: refs/heads/master c:
 4339e3f389081ea90e230a785bdbe10eccd02b71 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/arch/arm64/mm/fault.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index d171b09a65d6..c090b9320f57 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f15a2a12d01573fcf9d2beb657f308845d55fc66
+refs/heads/master: 4339e3f389081ea90e230a785bdbe10eccd02b71
diff --git a/trunk/arch/arm64/mm/fault.c b/trunk/arch/arm64/mm/fault.c
index afadae6682ed..52638171d6fd 100644
--- a/trunk/arch/arm64/mm/fault.c
+++ b/trunk/arch/arm64/mm/fault.c
@@ -57,16 +57,16 @@ void show_pte(struct mm_struct *mm, unsigned long addr)
 		pmd_t *pmd;
 		pte_t *pte;
 
-		if (pgd_none_or_clear_bad(pgd))
+		if (pgd_none(*pgd) || pgd_bad(*pgd))
 			break;
 
 		pud = pud_offset(pgd, addr);
-		if (pud_none_or_clear_bad(pud))
+		if (pud_none(*pud) || pud_bad(*pud))
 			break;
 
 		pmd = pmd_offset(pud, addr);
 		printk(", *pmd=%016llx", pmd_val(*pmd));
-		if (pmd_none_or_clear_bad(pmd))
+		if (pmd_none(*pmd) || pmd_bad(*pmd))
 			break;
 
 		pte = pte_offset_map(pmd, addr);