diff options
| author | Eric W. Biederman | 2019-02-07 17:05:12 +0100 |
|---|---|---|
| committer | Eric W. Biederman | 2019-05-29 16:31:43 +0200 |
| commit | ec74e9205e064af6a7076faabe649335acc78b69 (patch) | |
| tree | e04e01e867715a9641176adb0d0be1c09780b5ef /arch/unicore32 | |
| parent | signal/arm: Remove tsk parameter from __do_user_fault (diff) | |
| download | kernel-qcow2-linux-ec74e9205e064af6a7076faabe649335acc78b69.tar.gz kernel-qcow2-linux-ec74e9205e064af6a7076faabe649335acc78b69.tar.xz kernel-qcow2-linux-ec74e9205e064af6a7076faabe649335acc78b69.zip | |
signal/unicore32: Remove tsk parameter from __do_user_fault
The __do_user_fault function is always called with tsk == current.
Make that obvious by removing the tsk parameter.
This makes it clear that __do_user_fault calls force_sig_fault
on the current task.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'arch/unicore32')
| -rw-r--r-- | arch/unicore32/mm/fault.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/unicore32/mm/fault.c b/arch/unicore32/mm/fault.c index b9a3a50644c1..cadee0b3b4e0 100644 --- a/arch/unicore32/mm/fault.c +++ b/arch/unicore32/mm/fault.c @@ -116,10 +116,11 @@ static void __do_kernel_fault(struct mm_struct *mm, unsigned long addr, * Something tried to access memory that isn't in our memory map.. * 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) +static void __do_user_fault(unsigned long addr, unsigned int fsr, + unsigned int sig, int code, struct pt_regs *regs) { + struct task_struct *tsk = current; + tsk->thread.address = addr; tsk->thread.error_code = fsr; tsk->thread.trap_no = 14; @@ -136,7 +137,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); } @@ -310,7 +311,7 @@ retry: code = fault == VM_FAULT_BADACCESS ? 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: |