Revert "x86, mm: Make spurious_fault check explicitly check explicitly check the...

[linux-beck.git] / arch / x86 / mm / fault.c

diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
index fb674fd3fc2258f75400564acea0a835430f5988..2b97525246d43c3397f9d2149adf859b24b2842b 100644 (file)
--- a/arch/x86/mm/fault.c
+++ b/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);