From dca6d7dfd534277cc8600292d889465249dda7e2 Mon Sep 17 00:00:00 2001
From: Gustavo Fernando Padovan <gustavo@las.ic.unicamp.br>
Date: Wed, 25 Jun 2008 04:03:19 -0300
Subject: [PATCH] --- yaml --- r: 99409 b: refs/heads/master c:
 95c60b08c6af6db2165837139da10f593462d51c h: refs/heads/master i:   99407:
 59be3ca68e503ee97bc3244fdfb5e1cd41f22aeb v: v3

---
 [refs]                    | 2 +-
 trunk/arch/x86/mm/fault.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index f2448c4583d8..dc480efb8d42 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc4e0f9ae2b1b133d36c1392d0145d2997cff272
+refs/heads/master: 95c60b08c6af6db2165837139da10f593462d51c
diff --git a/trunk/arch/x86/mm/fault.c b/trunk/arch/x86/mm/fault.c
index 8bcb6f40ccb6..1e64795714c8 100644
--- a/trunk/arch/x86/mm/fault.c
+++ b/trunk/arch/x86/mm/fault.c
@@ -55,11 +55,7 @@ static inline int notify_page_fault(struct pt_regs *regs)
 	int ret = 0;
 
 	/* kprobe_running() needs smp_processor_id() */
-#ifdef CONFIG_X86_32
 	if (!user_mode_vm(regs)) {
-#else
-	if (!user_mode(regs)) {
-#endif
 		preempt_disable();
 		if (kprobe_running() && kprobe_fault_handler(regs, 14))
 			ret = 1;