2 files changed, 8 insertions, 7 deletions

diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c
index 6067fa4de22b..8cdb78642e93 100644
--- a/arch/arm/mm/alignment.c
+++ b/arch/arm/mm/alignment.c
@@ -945,7 +945,7 @@ do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
                 goto fixup;
 
         if (ai_usermode & UM_SIGNAL) {
-                force_sig_fault(SIGBUS, BUS_ADRALN, (void __user *)addr, current);
+                force_sig_fault(SIGBUS, BUS_ADRALN, (void __user *)addr);
         } else {
                 /*
                  * We're about to disable the alignment trap and return to
diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
index ec83c8fca62d..0e417233dad7 100644
--- a/arch/arm/mm/fault.c
+++ b/arch/arm/mm/fault.c
@@ -154,10 +154,11 @@ __do_kernel_fault(struct mm_struct *mm, unsigned long addr, unsigned int fsr,
  * User mode accesses just cause a SIGSEGV
  */
 static void
-__do_user_fault(struct task_struct *tsk, unsigned long addr,
-                unsigned int fsr, unsigned int sig, int code,
-                struct pt_regs *regs)
+__do_user_fault(unsigned long addr, unsigned int fsr, unsigned int sig,
+                int code, struct pt_regs *regs)
 {
+        struct task_struct *tsk = current;
+
         if (addr > TASK_SIZE)
                 harden_branch_predictor();
 
@@ -181,7 +182,7 @@ __do_user_fault(struct task_struct *tsk, unsigned long addr,
         tsk->thread.address = addr;
         tsk->thread.error_code = fsr;
         tsk->thread.trap_no = 14;
-        force_sig_fault(sig, code, (void __user *)addr, tsk);
+        force_sig_fault(sig, code, (void __user *)addr);
 }
 
 void do_bad_area(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
@@ -194,7 +195,7 @@ void do_bad_area(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
          * have no context to handle this fault with.
          */
         if (user_mode(regs))
-                __do_user_fault(tsk, addr, fsr, SIGSEGV, SEGV_MAPERR, regs);
+                __do_user_fault(addr, fsr, SIGSEGV, SEGV_MAPERR, regs);
         else
                 __do_kernel_fault(mm, addr, fsr, regs);
 }
@@ -390,7 +391,7 @@ retry:
                         SEGV_ACCERR : SEGV_MAPERR;
         }
 
-        __do_user_fault(tsk, addr, fsr, sig, code, regs);
+        __do_user_fault(addr, fsr, sig, code, regs);
         return 0;
 
 no_context: