From 835349c4fd2663d277fb969289cc8eab7f29fb6b Mon Sep 17 00:00:00 2001
From: Martin Schwidefsky <schwidefsky@de.ibm.com>
Date: Mon, 7 Dec 2009 12:51:44 +0100
Subject: [PATCH] --- yaml --- r: 173255 b: refs/heads/master c:
 7ecb344ae80bc03397ded3b004e06ecfe32becf9 h: refs/heads/master i:   173253:
 ed2f01a508b8583dfe9a90d5d708682d7bf1eaf8   173251:
 efc70b80a3a831b43643e9cad233af01b0e4dc13   173247:
 f7262f63b10476fec5fcfae880323a3b60b9b450 v: v3

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

diff --git a/[refs] b/[refs]
index c8d6c19d54d4..ab74e425923c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b11b53342773361f3353b285eb6a3fd6074e7997
+refs/heads/master: 7ecb344ae80bc03397ded3b004e06ecfe32becf9
diff --git a/trunk/arch/s390/mm/fault.c b/trunk/arch/s390/mm/fault.c
index 77108e34fc1a..fd72c269cdb4 100644
--- a/trunk/arch/s390/mm/fault.c
+++ b/trunk/arch/s390/mm/fault.c
@@ -52,11 +52,11 @@
 extern int sysctl_userprocess_debug;
 #endif
 
-#ifdef CONFIG_KPROBES
-static inline int notify_page_fault(struct pt_regs *regs, long err)
+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)) {
 		preempt_disable();
@@ -64,15 +64,9 @@ static inline int notify_page_fault(struct pt_regs *regs, long err)
 			ret = 1;
 		preempt_enable();
 	}
-
+#endif
 	return ret;
 }
-#else
-static inline int notify_page_fault(struct pt_regs *regs, long err)
-{
-	return 0;
-}
-#endif
 
 
 /*
@@ -274,7 +268,7 @@ do_exception(struct pt_regs *regs, unsigned long error_code, int write,
 	int si_code;
 	int fault;
 
-	if (notify_page_fault(regs, error_code))
+	if (notify_page_fault(regs))
 		return;
 
 	tsk = current;