diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-09-27 16:34:40 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-09-27 16:34:40 +0200 |
| commit | ae9a6149884e04b3460bd9d7ffe29c5ec8d223d8 (patch) | |
| tree | 373e19c07802ce43862f4a37a141f628bca0a401 /arch/csky/kernel/signal.c | |
| parent | 8217f07a50236779880f13e87f99224cd9117f83 (diff) | |
| parent | 5816b3e6577eaa676ceb00a848f0fd65fe2adc29 (diff) | |
| download | linux-ae9a6149884e04b3460bd9d7ffe29c5ec8d223d8.tar.gz linux-ae9a6149884e04b3460bd9d7ffe29c5ec8d223d8.tar.bz2 linux-ae9a6149884e04b3460bd9d7ffe29c5ec8d223d8.zip | |
Merge 5.15-rc3 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/csky/kernel/signal.c')
| -rw-r--r-- | arch/csky/kernel/signal.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/csky/kernel/signal.c b/arch/csky/kernel/signal.c index 312f046d452d..bc4238b9f709 100644 --- a/arch/csky/kernel/signal.c +++ b/arch/csky/kernel/signal.c @@ -260,8 +260,6 @@ asmlinkage void do_notify_resume(struct pt_regs *regs, if (thread_info_flags & (_TIF_SIGPENDING | _TIF_NOTIFY_SIGNAL)) do_signal(regs); - if (thread_info_flags & _TIF_NOTIFY_RESUME) { + if (thread_info_flags & _TIF_NOTIFY_RESUME) tracehook_notify_resume(regs); - rseq_handle_notify_resume(NULL, regs); - } } |