1 files changed, 19 insertions, 18 deletions

diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c
index fc102e70d9c2..2505b2ea0ef1 100644
--- a/arch/s390/mm/fault.c
+++ b/arch/s390/mm/fault.c
@@ -30,6 +30,7 @@
 #include <linux/kprobes.h>
 #include <linux/uaccess.h>
 #include <linux/hugetlb.h>
+#include <asm/asm-offsets.h>
 #include <asm/system.h>
 #include <asm/pgtable.h>
 #include <asm/s390_ext.h>
@@ -47,10 +48,6 @@
 #define __PF_RES_FIELD 0x8000000000000000ULL
 #endif /* CONFIG_64BIT */
 
-#ifdef CONFIG_SYSCTL
-extern int sysctl_userprocess_debug;
-#endif
-
 #define VM_FAULT_BADCONTEXT     0x010000
 #define VM_FAULT_BADMAP         0x020000
 #define VM_FAULT_BADACCESS      0x040000
@@ -59,15 +56,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;
 }
 
@@ -121,6 +116,22 @@ static inline int user_space_fault(unsigned long trans_exc_code)
         return trans_exc_code != 3;
 }
 
+static inline void report_user_fault(struct pt_regs *regs, long int_code,
+                                     int signr, unsigned long address)
+{
+        if ((task_pid_nr(current) > 1) && !show_unhandled_signals)
+                return;
+        if (!unhandled_signal(current, signr))
+                return;
+        if (!printk_ratelimit())
+                return;
+        printk("User process fault: interruption code 0x%lX ", int_code);
+        print_vma_addr(KERN_CONT "in ", regs->psw.addr & PSW_ADDR_INSN);
+        printk("\n");
+        printk("failing address: %lX\n", address);
+        show_regs(regs);
+}
+
 /*
  * Send SIGSEGV to task.  This is an external routine
  * to keep the stack usage of do_page_fault small.
@@ -134,17 +145,7 @@ static noinline void do_sigsegv(struct pt_regs *regs, long int_code,
         address = trans_exc_code & __FAIL_ADDR_MASK;
         current->thread.prot_addr = address;
         current->thread.trap_no = int_code;
-#if defined(CONFIG_SYSCTL) || defined(CONFIG_PROCESS_DEBUG)
-#if defined(CONFIG_SYSCTL)
-        if (sysctl_userprocess_debug)
-#endif
-        {
-                printk("User process fault: interruption code 0x%lX\n",
-                       int_code);
-                printk("failing address: %lX\n", address);
-                show_regs(regs);
-        }
-#endif
+        report_user_fault(regs, int_code, SIGSEGV, address);
         si.si_signo = SIGSEGV;
         si.si_code = si_code;
         si.si_addr = (void __user *) address;