aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-20 16:42:57 -0500
committerIngo Molnar <mingo@elte.hu>2009-02-20 18:09:42 -0500
commitb18018126f422f5b706fd750373425e10e84b486 (patch)
treee3e4954ca44999b25475307afb0653eed39ff63f /arch/x86
parentb814d41f0987c7648d7ed07471258101c95c026b (diff)
x86, mm, kprobes: fault.c, simplify notify_page_fault()
Impact: cleanup Remove an #ifdef from notify_page_fault(). The function still compiles to nothing in the !CONFIG_KPROBES case. Introduce kprobes_built_in() and kprobe_fault_handler() helpers to allow this - they returns 0 if !CONFIG_KPROBES. No code changed: text data bss dec hex filename 4618 32 24 4674 1242 fault.o.before 4618 32 24 4674 1242 fault.o.after Cc: Masami Hiramatsu <mhiramat@redhat.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/mm/fault.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
index fe99af4b86d9..379beaec6caa 100644
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@ -68,11 +68,10 @@ static inline int kmmio_fault(struct pt_regs *regs, unsigned long addr)
68 68
69static inline int notify_page_fault(struct pt_regs *regs) 69static inline int notify_page_fault(struct pt_regs *regs)
70{ 70{
71#ifdef CONFIG_KPROBES
72 int ret = 0; 71 int ret = 0;
73 72
74 /* kprobe_running() needs smp_processor_id() */ 73 /* kprobe_running() needs smp_processor_id() */
75 if (!user_mode_vm(regs)) { 74 if (kprobes_built_in() && !user_mode_vm(regs)) {
76 preempt_disable(); 75 preempt_disable();
77 if (kprobe_running() && kprobe_fault_handler(regs, 14)) 76 if (kprobe_running() && kprobe_fault_handler(regs, 14))
78 ret = 1; 77 ret = 1;
@@ -80,9 +79,6 @@ static inline int notify_page_fault(struct pt_regs *regs)
80 } 79 }
81 80
82 return ret; 81 return ret;
83#else
84 return 0;
85#endif
86} 82}
87 83
88/* 84/*