From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Fri, 26 Feb 2010 21:37:45 +0000 (+0100)
Subject: [S390] use kprobes_built_in() in mm/fault code
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=22e0a0467292222214d1974d9bc2664a6c05980d;p=mv-sheeva.git

[S390] use kprobes_built_in() in mm/fault code

Use kprobes_built_in() to avoid ifdefs like most other architectures do.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---

diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c
index 8af5b3cbed5..3040d7c78fe 100644
--- a/arch/s390/mm/fault.c
+++ b/arch/s390/mm/fault.c
@@ -60,15 +60,13 @@ static inline int notify_page_fault(struct pt_regs *regs)
 {
 	int ret = 0;
 
-#ifdef CONFIG_KPROBES
 	/* kprobe_running() needs smp_processor_id() */
-	if (!user_mode(regs)) {
+	if (kprobes_built_in() && !user_mode(regs)) {
 		preempt_disable();
 		if (kprobe_running() && kprobe_fault_handler(regs, 14))
 			ret = 1;
 		preempt_enable();
 	}
-#endif
 	return ret;
 }