s390/fault: merge report_user_fault implementations

We have two close to identical report_user_fault functions.
Add a parameter to one and get rid of the other one in order
to reduce code duplication.

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

1 files changed, 2 insertions, 19 deletions

diff --git a/arch/s390/kernel/traps.c b/arch/s390/kernel/traps.c
index 017eb03daee2..dd97a3e8a34a 100644
--- a/arch/s390/kernel/traps.c
+++ b/arch/s390/kernel/traps.c
@@ -22,8 +22,6 @@
 #include <asm/fpu/api.h>
 #include "entry.h"
 
-int show_unhandled_signals = 1;
-
 static inline void __user *get_trap_ip(struct pt_regs *regs)
 {
         unsigned long address;
@@ -35,21 +33,6 @@ static inline void __user *get_trap_ip(struct pt_regs *regs)
         return (void __user *) (address - (regs->int_code >> 16));
 }
 
-static inline void report_user_fault(struct pt_regs *regs, int signr)
-{
-        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 %04x ilc:%d ",
-               regs->int_code & 0xffff, regs->int_code >> 17);
-        print_vma_addr("in ", regs->psw.addr);
-        printk("\n");
-        show_regs(regs);
-}
-
 int is_valid_bugaddr(unsigned long addr)
 {
         return 1;
@@ -65,7 +48,7 @@ void do_report_trap(struct pt_regs *regs, int si_signo, int si_code, char *str)
                 info.si_code = si_code;
                 info.si_addr = get_trap_ip(regs);
                 force_sig_info(si_signo, &info, current);
-                report_user_fault(regs, si_signo);
+                report_user_fault(regs, si_signo, 0);
         } else {
                 const struct exception_table_entry *fixup;
                 fixup = search_exception_tables(regs->psw.addr);
@@ -111,7 +94,7 @@ NOKPROBE_SYMBOL(do_per_trap);
 void default_trap_handler(struct pt_regs *regs)
 {
         if (user_mode(regs)) {
-                report_user_fault(regs, SIGSEGV);
+                report_user_fault(regs, SIGSEGV, 0);
                 do_exit(SIGSEGV);
         } else
                 die(regs, "Unknown program exception");