2008-06-25 07:03:29

by Gustavo F. Padovan

Subject: [PATCH] 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 <[email protected]>


diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
--- 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;

2008-07-03 13:10:19

by Ingo Molnar

Subject: Re: [PATCH] x86: remove unnecessary #ifdef CONFIG_X86_32...#else

* Gustavo Fernando Padovan <[email protected]> wrote:

> Remove the #ifdef conditional because this comparison is already done
> in user_mode_vm().
>
> Signed-off-by: Gustavo F. Padovan <[email protected]>

applied to tip/x86/cleanups - thanks Gustavo.

Ingo