aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/mm/fault_32.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-07-04 13:50:10 -0400
committerPaul Mundt <lethal@linux-sh.org>2009-07-04 13:50:10 -0400
commitc63c3105e4991b2991ba73a742b8b59bfdbe4acd (patch)
treef059af5b7c9b14f1af343e1c9a1f172062a16202 /arch/sh/mm/fault_32.c
parent1ecc6ab669e7e82603c60e692566d2d592cb8fb4 (diff)
sh: use kprobes_built_in() for notify_page_fault().
Kill off the KPROBES ifdef, as per x86. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/mm/fault_32.c')
-rw-r--r--arch/sh/mm/fault_32.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/sh/mm/fault_32.c b/arch/sh/mm/fault_32.c
index 71925946f1e1..ce75b8882efb 100644
--- a/arch/sh/mm/fault_32.c
+++ b/arch/sh/mm/fault_32.c
@@ -25,14 +25,12 @@ static inline int notify_page_fault(struct pt_regs *regs, int trap)
25{ 25{
26 int ret = 0; 26 int ret = 0;
27 27
28#ifdef CONFIG_KPROBES 28 if (kprobes_built_in() && !user_mode(regs)) {
29 if (!user_mode(regs)) {
30 preempt_disable(); 29 preempt_disable();
31 if (kprobe_running() && kprobe_fault_handler(regs, trap)) 30 if (kprobe_running() && kprobe_fault_handler(regs, trap))
32 ret = 1; 31 ret = 1;
33 preempt_enable(); 32 preempt_enable();
34 } 33 }
35#endif
36 34
37 return ret; 35 return ret;
38} 36}