From f4a9092e858c5931f99f39d19e5f091bd9fe8ce8 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 27 Mar 2008 21:29:09 +0100
Subject: [PATCH] --- yaml --- r: 87875 b: refs/heads/master c:
 3085354de635179d70c240e6d942bcbd1d93056c h: refs/heads/master i:   87873:
 6ee6d3a742658ea7d3e5542bfc1ddb2406fff505   87871:
 2ebe08cf58782f5129615c1d687ab89abca31567 v: v3

---
 [refs]                    |  2 +-
 trunk/arch/x86/mm/fault.c | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 7a67ca18fa62..a5cbebcd7be3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fb8c7fb25d7d754a992481e9f763ec0b5889c4d9
+refs/heads/master: 3085354de635179d70c240e6d942bcbd1d93056c
diff --git a/trunk/arch/x86/mm/fault.c b/trunk/arch/x86/mm/fault.c
index c0c82bc143c9..ec08d8389850 100644
--- a/trunk/arch/x86/mm/fault.c
+++ b/trunk/arch/x86/mm/fault.c
@@ -91,13 +91,10 @@ static int is_prefetch(struct pt_regs *regs, unsigned long addr,
 	int prefetch = 0;
 	unsigned char *max_instr;
 
-#ifdef CONFIG_X86_32
-	/* Catch an obscure case of prefetch inside an NX page: */
-	if ((__supported_pte_mask & _PAGE_NX) && (error_code & 16))
-		return 0;
-#endif
-
-	/* If it was a exec fault on NX page, ignore */
+	/*
+	 * If it was a exec (instruction fetch) fault on NX page, then
+	 * do not ignore the fault:
+	 */
 	if (error_code & PF_INSTR)
 		return 0;