commit c63c3105e4991b2991ba73a742b8b59bfdbe4acd
author Paul Mundt <lethal@linux-sh.org> Sun Jul 05 02:50:10 2009 +0900
committer Paul Mundt <lethal@linux-sh.org> Sun Jul 05 02:50:10 2009 +0900
tree f059af5b7c9b14f1af343e1c9a1f172062a16202
parent 1ecc6ab669e7e82603c60e692566d2d592cb8fb4

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>

arch/sh/mm/fault_32.c

diff --git a/arch/sh/mm/fault_32.c b/arch/sh/mm/fault_32.c
index 7192594..ce75b88 100644
--- a/arch/sh/mm/fault_32.c
+++ b/arch/sh/mm/fault_32.c
@@ -25,14 +25,12 @@
 {
 	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;
 }