---

yaml --- r: 359112 b: refs/heads/master c: 954f857 h: refs/heads/master v: v3
git-mirror · Feb 24, 2013 · 80197d0 · 80197d0
1 parent f1d237c
commit 80197d0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 942670d0dc41b5fe9b735c31ca9234d80729bf7e
+refs/heads/master: 954f857187033ee3d3704a8206715cf354c38898
diff --git a/trunk/arch/x86/mm/fault.c b/trunk/arch/x86/mm/fault.c
@@ -939,14 +939,8 @@ spurious_fault(unsigned long error_code, unsigned long address)
 	if (pmd_large(*pmd))
 		return spurious_fault_check(error_code, (pte_t *) pmd);
 
-	/*
-	 * Note: don't use pte_present() here, since it returns true
-	 * if the _PAGE_PROTNONE bit is set.  However, this aliases the
-	 * _PAGE_GLOBAL bit, which for kernel pages give false positives
-	 * when CONFIG_DEBUG_PAGEALLOC is used.
-	 */
 	pte = pte_offset_kernel(pmd, address);
-	if (!(pte_flags(*pte) & _PAGE_PRESENT))
+	if (!pte_present(*pte))
 		return 0;
 
 	ret = spurious_fault_check(error_code, pte);