From 0b6cb37d9eaebcaefaab46de97224d90bd9df9be Mon Sep 17 00:00:00 2001
From: Harvey Harrison <harvey.harrison@gmail.com>
Date: Wed, 30 Jan 2008 13:34:11 +0100
Subject: [PATCH] --- yaml --- r: 80565 b: refs/heads/master c:
 b406ac61e94875723540bd56e26f634afdeef489 h: refs/heads/master i:   80563:
 82844fa93213fd6006625f4aca0f7d95760849c4 v: v3

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

diff --git a/[refs] b/[refs]
index 23623247dc39..87816946ac0b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c61e211d9989e4c112d3d58db12ad58f9016a3c8
+refs/heads/master: b406ac61e94875723540bd56e26f634afdeef489
diff --git a/trunk/arch/x86/mm/fault.c b/trunk/arch/x86/mm/fault.c
index 14a0c6e541de..99d273dbc758 100644
--- a/trunk/arch/x86/mm/fault.c
+++ b/trunk/arch/x86/mm/fault.c
@@ -92,18 +92,13 @@ static int is_prefetch(struct pt_regs *regs, unsigned long addr,
 	unsigned char *max_instr;
 
 #ifdef CONFIG_X86_32
-# ifdef CONFIG_X86_PAE
-	/* If it was a exec fault on NX page, ignore */
-	if (nx_enabled && (error_code & PF_INSTR))
+	if (!(__supported_pte_mask & _PAGE_NX))
 		return 0;
-# else
-	return 0;
-# endif
-#else /* CONFIG_X86_64 */
+#endif
+
 	/* If it was a exec fault on NX page, ignore */
 	if (error_code & PF_INSTR)
 		return 0;
-#endif
 
 	instr = (unsigned char *)convert_ip_to_linear(current, regs);
 	max_instr = instr + 15;