1 files changed, 6 insertions, 10 deletions

diff --git a/arch/um/kernel/trap.c b/arch/um/kernel/trap.c
index 0e8b6158f224..58fe36856182 100644
--- a/arch/um/kernel/trap.c
+++ b/arch/um/kernel/trap.c
@@ -163,13 +163,12 @@ static void show_segv_info(struct uml_pt_regs *regs)
 static void bad_segv(struct faultinfo fi, unsigned long ip)
 {
         current->thread.arch.faultinfo = fi;
-        force_sig_fault(SIGSEGV, SEGV_ACCERR, (void __user *) FAULT_ADDRESS(fi),
-                        current);
+        force_sig_fault(SIGSEGV, SEGV_ACCERR, (void __user *) FAULT_ADDRESS(fi));
 }
 
 void fatal_sigsegv(void)
 {
-        force_sigsegv(SIGSEGV, current);
+        force_sigsegv(SIGSEGV);
         do_signal(&current->thread.regs);
         /*
          * This is to tell gcc that we're not returning - do_signal
@@ -268,13 +267,11 @@ unsigned long segv(struct faultinfo fi, unsigned long ip, int is_user,
 
         if (err == -EACCES) {
                 current->thread.arch.faultinfo = fi;
-                force_sig_fault(SIGBUS, BUS_ADRERR, (void __user *)address,
-                                current);
+                force_sig_fault(SIGBUS, BUS_ADRERR, (void __user *)address);
         } else {
                 BUG_ON(err != -EFAULT);
                 current->thread.arch.faultinfo = fi;
-                force_sig_fault(SIGSEGV, si_code, (void __user *) address,
-                                current);
+                force_sig_fault(SIGSEGV, si_code, (void __user *) address);
         }
 
 out:
@@ -304,12 +301,11 @@ void relay_signal(int sig, struct siginfo *si, struct uml_pt_regs *regs)
         if ((err == 0) && (siginfo_layout(sig, code) == SIL_FAULT)) {
                 struct faultinfo *fi = UPT_FAULTINFO(regs);
                 current->thread.arch.faultinfo = *fi;
-                force_sig_fault(sig, code, (void __user *)FAULT_ADDRESS(*fi),
-                                current);
+                force_sig_fault(sig, code, (void __user *)FAULT_ADDRESS(*fi));
         } else {
                 printk(KERN_ERR "Attempted to relay unknown signal %d (si_code = %d) with errno %d\n",
                        sig, code, err);
-                force_sig(sig, current);
+                force_sig(sig);
         }
 }