From 8447a514688ab930373d75a643e1552987c9b8b8 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Fri, 26 Feb 2010 22:37:45 +0100
Subject: [PATCH] --- yaml --- r: 182178 b: refs/heads/master c:
 22e0a0467292222214d1974d9bc2664a6c05980d h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/arch/s390/mm/fault.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 08861c97efee..7a71ee61e67f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 52499f40267e1178b3b2c887aee85c0c9fd01ec0
+refs/heads/master: 22e0a0467292222214d1974d9bc2664a6c05980d
diff --git a/trunk/arch/s390/mm/fault.c b/trunk/arch/s390/mm/fault.c
index 8af5b3cbed50..3040d7c78fe0 100644
--- a/trunk/arch/s390/mm/fault.c
+++ b/trunk/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;
 }