From: Gustavo Fernando Padovan <gustavo@las.ic.unicamp.br>
Date: Wed, 25 Jun 2008 07:03:19 +0000 (-0300)
Subject: x86: remove unnecessary #ifdef CONFIG_X86_32...#else
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=95c60b08c6af6db2165837139da10f593462d51c;p=linux-beck.git

x86: remove unnecessary #ifdef CONFIG_X86_32...#else

Remove the #ifdef conditional because this comparison is already done in
user_mode_vm().

Signed-off-by: Gustavo F. Padovan <gustavo@las.ic.unicamp.br>
Cc: akpm@osdl.org
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
index 8bcb6f40ccb6..1e64795714c8 100644
--- a/arch/x86/mm/fault.c
+++ b/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;