7 files changed, 25 insertions, 28 deletions

diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
index c4bccd97f3cf..4282116e28e7 100644
--- a/arch/sparc/kernel/process_64.c
+++ b/arch/sparc/kernel/process_64.c
@@ -519,7 +519,7 @@ void synchronize_user_stack(void)
 
 static void stack_unaligned(unsigned long sp)
 {
-        force_sig_fault(SIGBUS, BUS_ADRALN, (void __user *) sp, 0, current);
+        force_sig_fault(SIGBUS, BUS_ADRALN, (void __user *) sp, 0);
 }
 
 static const char uwfault32[] = KERN_INFO \
diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c
index 452e4d080855..be77538bc038 100644
--- a/arch/sparc/kernel/sys_sparc_32.c
+++ b/arch/sparc/kernel/sys_sparc_32.c
@@ -151,7 +151,7 @@ sparc_breakpoint (struct pt_regs *regs)
 #ifdef DEBUG_SPARC_BREAKPOINT
         printk ("TRAP: Entering kernel PC=%x, nPC=%x\n", regs->pc, regs->npc);
 #endif
-        force_sig_fault(SIGTRAP, TRAP_BRKPT, (void __user *)regs->pc, 0, current);
+        force_sig_fault(SIGTRAP, TRAP_BRKPT, (void __user *)regs->pc, 0);
 
 #ifdef DEBUG_SPARC_BREAKPOINT
         printk ("TRAP: Returning to space: PC=%x nPC=%x\n", regs->pc, regs->npc);
diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
index 9825ca6a6020..ccc88926bc00 100644
--- a/arch/sparc/kernel/sys_sparc_64.c
+++ b/arch/sparc/kernel/sys_sparc_64.c
@@ -511,7 +511,7 @@ asmlinkage void sparc_breakpoint(struct pt_regs *regs)
 #ifdef DEBUG_SPARC_BREAKPOINT
         printk ("TRAP: Entering kernel PC=%lx, nPC=%lx\n", regs->tpc, regs->tnpc);
 #endif
-        force_sig_fault(SIGTRAP, TRAP_BRKPT, (void __user *)regs->tpc, 0, current);
+        force_sig_fault(SIGTRAP, TRAP_BRKPT, (void __user *)regs->tpc, 0);
 #ifdef DEBUG_SPARC_BREAKPOINT
         printk ("TRAP: Returning to space: PC=%lx nPC=%lx\n", regs->tpc, regs->tnpc);
 #endif
diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c
index bcdfc6168dd5..4ceecad556a9 100644
--- a/arch/sparc/kernel/traps_32.c
+++ b/arch/sparc/kernel/traps_32.c
@@ -103,7 +103,7 @@ void do_hw_interrupt(struct pt_regs *regs, unsigned long type)
                 die_if_kernel("Kernel bad trap", regs);
 
         force_sig_fault(SIGILL, ILL_ILLTRP,
-                        (void __user *)regs->pc, type - 0x80, current);
+                        (void __user *)regs->pc, type - 0x80);
 }
 
 void do_illegal_instruction(struct pt_regs *regs, unsigned long pc, unsigned long npc,
@@ -327,7 +327,7 @@ void handle_reg_access(struct pt_regs *regs, unsigned long pc, unsigned long npc
         printk("Register Access Exception at PC %08lx NPC %08lx PSR %08lx\n",
                pc, npc, psr);
 #endif
-        force_sig_fault(SIGBUS, BUS_OBJERR, (void __user *)pc, 0, current);
+        force_sig_fault(SIGBUS, BUS_OBJERR, (void __user *)pc, 0);
 }
 
 void handle_cp_disabled(struct pt_regs *regs, unsigned long pc, unsigned long npc,
diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
index 12bfc7e215ca..614d92c18506 100644
--- a/arch/sparc/kernel/traps_64.c
+++ b/arch/sparc/kernel/traps_64.c
@@ -107,7 +107,7 @@ void bad_trap(struct pt_regs *regs, long lvl)
                 regs->tnpc &= 0xffffffff;
         }
         force_sig_fault(SIGILL, ILL_ILLTRP,
-                        (void __user *)regs->tpc, lvl, current);
+                        (void __user *)regs->tpc, lvl);
 }
 
 void bad_trap_tl1(struct pt_regs *regs, long lvl)
@@ -201,7 +201,7 @@ void spitfire_insn_access_exception(struct pt_regs *regs, unsigned long sfsr, un
                 regs->tnpc &= 0xffffffff;
         }
         force_sig_fault(SIGSEGV, SEGV_MAPERR,
-                        (void __user *)regs->tpc, 0, current);
+                        (void __user *)regs->tpc, 0);
 out:
         exception_exit(prev_state);
 }
@@ -236,7 +236,7 @@ void sun4v_insn_access_exception(struct pt_regs *regs, unsigned long addr, unsig
                 regs->tpc &= 0xffffffff;
                 regs->tnpc &= 0xffffffff;
         }
-        force_sig_fault(SIGSEGV, SEGV_MAPERR, (void __user *) addr, 0, current);
+        force_sig_fault(SIGSEGV, SEGV_MAPERR, (void __user *) addr, 0);
 }
 
 void sun4v_insn_access_exception_tl1(struct pt_regs *regs, unsigned long addr, unsigned long type_ctx)
@@ -321,7 +321,7 @@ void spitfire_data_access_exception(struct pt_regs *regs, unsigned long sfsr, un
         if (is_no_fault_exception(regs))
                 return;
 
-        force_sig_fault(SIGSEGV, SEGV_MAPERR, (void __user *)sfar, 0, current);
+        force_sig_fault(SIGSEGV, SEGV_MAPERR, (void __user *)sfar, 0);
 out:
         exception_exit(prev_state);
 }
@@ -385,16 +385,13 @@ void sun4v_data_access_exception(struct pt_regs *regs, unsigned long addr, unsig
          */
         switch (type) {
         case HV_FAULT_TYPE_INV_ASI:
-                force_sig_fault(SIGILL, ILL_ILLADR, (void __user *)addr, 0,
-                                current);
+                force_sig_fault(SIGILL, ILL_ILLADR, (void __user *)addr, 0);
                 break;
         case HV_FAULT_TYPE_MCD_DIS:
-                force_sig_fault(SIGSEGV, SEGV_ACCADI, (void __user *)addr, 0,
-                                current);
+                force_sig_fault(SIGSEGV, SEGV_ACCADI, (void __user *)addr, 0);
                 break;
         default:
-                force_sig_fault(SIGSEGV, SEGV_MAPERR, (void __user *)addr, 0,
-                                current);
+                force_sig_fault(SIGSEGV, SEGV_MAPERR, (void __user *)addr, 0);
                 break;
         }
 }
@@ -571,7 +568,7 @@ static void spitfire_ue_log(unsigned long afsr, unsigned long afar, unsigned lon
                 regs->tpc &= 0xffffffff;
                 regs->tnpc &= 0xffffffff;
         }
-        force_sig_fault(SIGBUS, BUS_OBJERR, (void *)0, 0, current);
+        force_sig_fault(SIGBUS, BUS_OBJERR, (void *)0, 0);
 }
 
 void spitfire_access_error(struct pt_regs *regs, unsigned long status_encoded, unsigned long afar)
@@ -2073,7 +2070,7 @@ void do_mcd_err(struct pt_regs *regs, struct sun4v_error_entry ent)
          * code
          */
         force_sig_fault(SIGSEGV, SEGV_ADIDERR, (void __user *)ent.err_raddr,
-                        0, current);
+                        0);
 }
 
 /* We run with %pil set to PIL_NORMAL_MAX and PSTATE_IE enabled in %pstate.
@@ -2187,7 +2184,7 @@ bool sun4v_nonresum_error_user_handled(struct pt_regs *regs,
         }
         if (attrs & SUN4V_ERR_ATTRS_PIO) {
                 force_sig_fault(SIGBUS, BUS_ADRERR,
-                                (void __user *)sun4v_get_vaddr(regs), 0, current);
+                                (void __user *)sun4v_get_vaddr(regs), 0);
                 return true;
         }
 
@@ -2344,7 +2341,7 @@ static void do_fpe_common(struct pt_regs *regs)
                                 code = FPE_FLTRES;
                 }
                 force_sig_fault(SIGFPE, code,
-                                (void __user *)regs->tpc, 0, current);
+                                (void __user *)regs->tpc, 0);
         }
 }
 
@@ -2399,7 +2396,7 @@ void do_tof(struct pt_regs *regs)
                 regs->tnpc &= 0xffffffff;
         }
         force_sig_fault(SIGEMT, EMT_TAGOVF,
-                        (void __user *)regs->tpc, 0, current);
+                        (void __user *)regs->tpc, 0);
 out:
         exception_exit(prev_state);
 }
@@ -2419,7 +2416,7 @@ void do_div0(struct pt_regs *regs)
                 regs->tnpc &= 0xffffffff;
         }
         force_sig_fault(SIGFPE, FPE_INTDIV,
-                        (void __user *)regs->tpc, 0, current);
+                        (void __user *)regs->tpc, 0);
 out:
         exception_exit(prev_state);
 }
@@ -2615,7 +2612,7 @@ void do_illegal_instruction(struct pt_regs *regs)
                         }
                 }
         }
-        force_sig_fault(SIGILL, ILL_ILLOPC, (void __user *)pc, 0, current);
+        force_sig_fault(SIGILL, ILL_ILLOPC, (void __user *)pc, 0);
 out:
         exception_exit(prev_state);
 }
@@ -2635,7 +2632,7 @@ void mem_address_unaligned(struct pt_regs *regs, unsigned long sfar, unsigned lo
         if (is_no_fault_exception(regs))
                 return;
 
-        force_sig_fault(SIGBUS, BUS_ADRALN, (void __user *)sfar, 0, current);
+        force_sig_fault(SIGBUS, BUS_ADRALN, (void __user *)sfar, 0);
 out:
         exception_exit(prev_state);
 }
@@ -2653,7 +2650,7 @@ void sun4v_do_mna(struct pt_regs *regs, unsigned long addr, unsigned long type_c
         if (is_no_fault_exception(regs))
                 return;
 
-        force_sig_fault(SIGBUS, BUS_ADRALN, (void __user *) addr, 0, current);
+        force_sig_fault(SIGBUS, BUS_ADRALN, (void __user *) addr, 0);
 }
 
 /* sun4v_mem_corrupt_detect_precise() - Handle precise exception on an ADI
@@ -2700,7 +2697,7 @@ void sun4v_mem_corrupt_detect_precise(struct pt_regs *regs, unsigned long addr,
                 regs->tpc &= 0xffffffff;
                 regs->tnpc &= 0xffffffff;
         }
-        force_sig_fault(SIGSEGV, SEGV_ADIPERR, (void __user *)addr, 0, current);
+        force_sig_fault(SIGSEGV, SEGV_ADIPERR, (void __user *)addr, 0);
 }
 
 void do_privop(struct pt_regs *regs)
@@ -2716,7 +2713,7 @@ void do_privop(struct pt_regs *regs)
                 regs->tnpc &= 0xffffffff;
         }
         force_sig_fault(SIGILL, ILL_PRVOPC,
-                        (void __user *)regs->tpc, 0, current);
+                        (void __user *)regs->tpc, 0);
 out:
         exception_exit(prev_state);
 }
diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
index 2731faf415ba..8d69de111470 100644
--- a/arch/sparc/mm/fault_32.c
+++ b/arch/sparc/mm/fault_32.c
@@ -131,7 +131,7 @@ static void __do_fault_siginfo(int code, int sig, struct pt_regs *regs,
                 show_signal_msg(regs, sig, code,
                                 addr, current);
 
-        force_sig_fault(sig, code, (void __user *) addr, 0, current);
+        force_sig_fault(sig, code, (void __user *) addr, 0);
 }
 
 static unsigned long compute_si_addr(struct pt_regs *regs, int text_fault)
diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
index 8f8a604c1300..83fda4d9c3b2 100644
--- a/arch/sparc/mm/fault_64.c
+++ b/arch/sparc/mm/fault_64.c
@@ -187,7 +187,7 @@ static void do_fault_siginfo(int code, int sig, struct pt_regs *regs,
         if (unlikely(show_unhandled_signals))
                 show_signal_msg(regs, sig, code, addr, current);
 
-        force_sig_fault(sig, code, (void __user *) addr, 0, current);
+        force_sig_fault(sig, code, (void __user *) addr, 0);
 }
 
 static unsigned int get_fault_insn(struct pt_regs *regs, unsigned int insn)