diff options
author | Gustavo Fernando Padovan <gustavo@las.ic.unicamp.br> | 2008-06-25 03:03:19 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-03 09:09:10 -0400 |
commit | 95c60b08c6af6db2165837139da10f593462d51c (patch) | |
tree | 9eb5c52ea58870f0fc7c19b13c284bf2198826fd /arch/x86/mm/fault.c | |
parent | bc4e0f9ae2b1b133d36c1392d0145d2997cff272 (diff) |
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>
Diffstat (limited to 'arch/x86/mm/fault.c')
-rw-r--r-- | arch/x86/mm/fault.c | 4 |
1 files changed, 0 insertions, 4 deletions
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) | |||
55 | int ret = 0; | 55 | int ret = 0; |
56 | 56 | ||
57 | /* kprobe_running() needs smp_processor_id() */ | 57 | /* kprobe_running() needs smp_processor_id() */ |
58 | #ifdef CONFIG_X86_32 | ||
59 | if (!user_mode_vm(regs)) { | 58 | if (!user_mode_vm(regs)) { |
60 | #else | ||
61 | if (!user_mode(regs)) { | ||
62 | #endif | ||
63 | preempt_disable(); | 59 | preempt_disable(); |
64 | if (kprobe_running() && kprobe_fault_handler(regs, 14)) | 60 | if (kprobe_running() && kprobe_fault_handler(regs, 14)) |
65 | ret = 1; | 61 | ret = 1; |