diff options
| author | Linus Walleij <[email protected]> | 2021-11-27 00:54:16 +0100 |
|---|---|---|
| committer | Linus Walleij <[email protected]> | 2021-11-27 00:54:16 +0100 |
| commit | 2448eab44034d9603c97ca17760a53d4d6e4b60c (patch) | |
| tree | 7f323cea55258e94e0c7c70b63d02c9effb00c1f /arch/sparc/kernel/windows.c | |
| parent | deee705a1c9cce9c7eb699d529f1c0b3c80d339d (diff) | |
| parent | 136057256686de39cc3a07c2e39ef6bc43003ff6 (diff) | |
Merge tag 'v5.16-rc2' into devel
Linux 5.16-rc2 is needed because nonurgent fixes headed
for next are strongly textually dependent on a fix that
was applied for rc2.
Signed-off-by: Linus Walleij <[email protected]>
Diffstat (limited to 'arch/sparc/kernel/windows.c')
| -rw-r--r-- | arch/sparc/kernel/windows.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/windows.c b/arch/sparc/kernel/windows.c index bbbd40cc6b28..8f20862ccc83 100644 --- a/arch/sparc/kernel/windows.c +++ b/arch/sparc/kernel/windows.c @@ -122,7 +122,7 @@ void try_to_clear_window_buffer(struct pt_regs *regs, int who) if ((sp & 7) || copy_to_user((char __user *) sp, &tp->reg_window[window], sizeof(struct reg_window32))) { - force_fatal_sig(SIGILL); + force_exit_sig(SIGILL); return; } } |