diff options
| author | Mark Brown <broonie@kernel.org> | 2021-10-07 22:35:27 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-10-07 22:35:27 +0100 |
| commit | 5fe7bd5a37ff0d77936f8e38313db5da2dd53f70 (patch) | |
| tree | 5012e70d0993aa23466e06012d2bfb98ba04aa29 /arch/mips | |
| parent | 48a78c66ad5d9d4f918182335d6e5726e7008085 (diff) | |
| parent | 67a12ae52599c9f2f24ef14adb43fc3b164792b5 (diff) | |
Merge branch 'spi-5.15' into spi-5.16
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/kernel/signal.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/mips/kernel/signal.c b/arch/mips/kernel/signal.c index f1e985109da0..c9b2a75563e1 100644 --- a/arch/mips/kernel/signal.c +++ b/arch/mips/kernel/signal.c @@ -906,10 +906,8 @@ asmlinkage void do_notify_resume(struct pt_regs *regs, void *unused, 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); - } user_enter(); } |