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

[sfrench/cifs-2.6.git] / arch / arm / mm / fault.c

diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
index ec83c8fca62da1cd60794763874219fa01c3ada9..0e417233dad7209255c370d3cee65ee336ec34ab 100644 (file)
--- 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: