aboutsummaryrefslogtreecommitdiff
path: root/arch/sh/mm
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-07-05 02:50:10 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-07-05 02:50:10 +0900
commitc63c3105e4991b2991ba73a742b8b59bfdbe4acd (patch)
treef059af5b7c9b14f1af343e1c9a1f172062a16202 /arch/sh/mm
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')
-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 71925946f1e..ce75b8882ef 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)
{
int ret = 0;
-#ifdef CONFIG_KPROBES
- if (!user_mode(regs)) {
+ if (kprobes_built_in() && !user_mode(regs)) {
preempt_disable();
if (kprobe_running() && kprobe_fault_handler(regs, trap))
ret = 1;
preempt_enable();
}
-#endif
return ret;
}