From: Paul Mundt <lethal@linux-sh.org>
Date: Sat, 4 Jul 2009 17:50:10 +0000 (+0900)
Subject: sh: use kprobes_built_in() for notify_page_fault().
X-Git-Tag: firefly_0821_release~12920^2~104^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c63c3105e4991b2991ba73a742b8b59bfdbe4acd;p=firefly-linux-kernel-4.4.55.git

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>
---

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)
 {
 	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;
 }