---

yaml --- r: 212059 b: refs/heads/master c: 660a293 h: refs/heads/master i: 212057: 8d6ffaa 212055: 7322e17 v: v3
git-mirror · Aug 26, 2010 · 2a7d90d · 2a7d90d
1 parent f4ba792
commit 2a7d90d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9b861528a8012e7bc4d1f7bae07395b225331477
+refs/heads/master: 660a293ea9be709b893d371fbc0328fcca33c33a
diff --git a/trunk/arch/x86/mm/fault.c b/trunk/arch/x86/mm/fault.c
@@ -872,8 +872,14 @@ 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_present(*pte))
+	if (!(pte_flags(*pte) & _PAGE_PRESENT))
 		return 0;
 
 	ret = spurious_fault_check(error_code, pte);