diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2019-05-23 12:04:24 -0400 |
---|---|---|
committer | Eric W. Biederman <ebiederm@xmission.com> | 2019-05-29 10:31:43 -0400 |
commit | 2e1661d2673667d886cd40ad9f414cb6db48d8da (patch) | |
tree | 5a2c32eb8a5c575bfb5c7013f5d9d427f5c06c34 /arch/m68k | |
parent | 91ca180dbdd687d45fe4aab055b02d29c91b90df (diff) |
signal: Remove the task parameter from force_sig_fault
As synchronous exceptions really only make sense against the current
task (otherwise how are you synchronous) remove the task parameter
from from force_sig_fault to make it explicit that is what is going
on.
The two known exceptions that deliver a synchronous exception to a
stopped ptraced task have already been changed to
force_sig_fault_to_task.
The callers have been changed with the following emacs regular expression
(with obvious variations on the architectures that take more arguments)
to avoid typos:
force_sig_fault[(]\([^,]+\)[,]\([^,]+\)[,]\([^,]+\)[,]\W+current[)]
->
force_sig_fault(\1,\2,\3)
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'arch/m68k')
-rw-r--r-- | arch/m68k/kernel/traps.c | 4 | ||||
-rw-r--r-- | arch/m68k/mm/fault.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/m68k/kernel/traps.c b/arch/m68k/kernel/traps.c index 2b6e143abd73..344f93d36a9a 100644 --- a/arch/m68k/kernel/traps.c +++ b/arch/m68k/kernel/traps.c | |||
@@ -1127,7 +1127,7 @@ asmlinkage void trap_c(struct frame *fp) | |||
1127 | addr = (void __user*) fp->un.fmtb.daddr; | 1127 | addr = (void __user*) fp->un.fmtb.daddr; |
1128 | break; | 1128 | break; |
1129 | } | 1129 | } |
1130 | force_sig_fault(sig, si_code, addr, current); | 1130 | force_sig_fault(sig, si_code, addr); |
1131 | } | 1131 | } |
1132 | 1132 | ||
1133 | void die_if_kernel (char *str, struct pt_regs *fp, int nr) | 1133 | void die_if_kernel (char *str, struct pt_regs *fp, int nr) |
@@ -1159,6 +1159,6 @@ asmlinkage void fpsp040_die(void) | |||
1159 | #ifdef CONFIG_M68KFPU_EMU | 1159 | #ifdef CONFIG_M68KFPU_EMU |
1160 | asmlinkage void fpemu_signal(int signal, int code, void *addr) | 1160 | asmlinkage void fpemu_signal(int signal, int code, void *addr) |
1161 | { | 1161 | { |
1162 | force_sig_fault(signal, code, addr, current); | 1162 | force_sig_fault(signal, code, addr); |
1163 | } | 1163 | } |
1164 | #endif | 1164 | #endif |
diff --git a/arch/m68k/mm/fault.c b/arch/m68k/mm/fault.c index 9b6163c05a75..e9b1d7585b43 100644 --- a/arch/m68k/mm/fault.c +++ b/arch/m68k/mm/fault.c | |||
@@ -30,13 +30,13 @@ int send_fault_sig(struct pt_regs *regs) | |||
30 | pr_debug("send_fault_sig: %p,%d,%d\n", addr, signo, si_code); | 30 | pr_debug("send_fault_sig: %p,%d,%d\n", addr, signo, si_code); |
31 | 31 | ||
32 | if (user_mode(regs)) { | 32 | if (user_mode(regs)) { |
33 | force_sig_fault(signo, si_code, addr, current); | 33 | force_sig_fault(signo, si_code, addr); |
34 | } else { | 34 | } else { |
35 | if (fixup_exception(regs)) | 35 | if (fixup_exception(regs)) |
36 | return -1; | 36 | return -1; |
37 | 37 | ||
38 | //if (signo == SIGBUS) | 38 | //if (signo == SIGBUS) |
39 | // force_sig_fault(si_signo, si_code, addr, current); | 39 | // force_sig_fault(si_signo, si_code, addr); |
40 | 40 | ||
41 | /* | 41 | /* |
42 | * Oops. The kernel tried to access some bad page. We'll have to | 42 | * Oops. The kernel tried to access some bad page. We'll have to |