Merge branch 'siginfo-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebieder...

[sfrench/cifs-2.6.git] / arch / s390 / kernel / traps.c

diff --git a/arch/s390/kernel/traps.c b/arch/s390/kernel/traps.c
index 4736b6ec0ad2c62606d8e20f1dd3796a2200536f..164c0282b41ae62df2498b8082d6cabf9f40d975 100644 (file)
--- a/arch/s390/kernel/traps.c
+++ b/arch/s390/kernel/traps.c
@@ -45,7 +45,7 @@ int is_valid_bugaddr(unsigned long addr)
 void do_report_trap(struct pt_regs *regs, int si_signo, int si_code, char *str)
 {
        if (user_mode(regs)) {
-               force_sig_fault(si_signo, si_code, get_trap_ip(regs), current);
+               force_sig_fault(si_signo, si_code, get_trap_ip(regs));
                report_user_fault(regs, si_signo, 0);
         } else {
                 const struct exception_table_entry *fixup;
@@ -79,7 +79,7 @@ void do_per_trap(struct pt_regs *regs)
        if (!current->ptrace)
                return;
        force_sig_fault(SIGTRAP, TRAP_HWBKPT,
-               (void __force __user *) current->thread.per_event.address, current);
+               (void __force __user *) current->thread.per_event.address);
 }
 NOKPROBE_SYMBOL(do_per_trap);
 
@@ -165,7 +165,7 @@ void illegal_op(struct pt_regs *regs)
                        return;
                if (*((__u16 *) opcode) == S390_BREAKPOINT_U16) {
                        if (current->ptrace)
-                               force_sig_fault(SIGTRAP, TRAP_BRKPT, location, current);
+                               force_sig_fault(SIGTRAP, TRAP_BRKPT, location);
                        else
                                signal = SIGILL;
 #ifdef CONFIG_UPROBES