diff options
| author | Wolfram Sang <wsa@kernel.org> | 2021-10-11 08:15:48 +0200 |
|---|---|---|
| committer | Wolfram Sang <wsa@kernel.org> | 2021-10-11 08:15:48 +0200 |
| commit | c5c34f5793f384ed2895584c6e2350b059c3f161 (patch) | |
| tree | 14a73568207fb3d38d7aa43439493ac8bc906bde /kernel/entry/common.c | |
| parent | 669b2e4aa1a869def4dc207ea084fdd77366d646 (diff) | |
| parent | 64570fbc14f8d7cb3fe3995f20e26bc25ce4b2cc (diff) | |
Merge branch 'i2c/for-current' into i2c/for-mergewindow
Diffstat (limited to 'kernel/entry/common.c')
| -rw-r--r-- | kernel/entry/common.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel/entry/common.c b/kernel/entry/common.c index bf16395b9e13..d5a61d565ad5 100644 --- a/kernel/entry/common.c +++ b/kernel/entry/common.c @@ -171,10 +171,8 @@ static unsigned long exit_to_user_mode_loop(struct pt_regs *regs, if (ti_work & (_TIF_SIGPENDING | _TIF_NOTIFY_SIGNAL)) handle_signal_work(regs, ti_work); - if (ti_work & _TIF_NOTIFY_RESUME) { + if (ti_work & _TIF_NOTIFY_RESUME) tracehook_notify_resume(regs); - rseq_handle_notify_resume(NULL, regs); - } /* Architecture specific TIF work */ arch_exit_to_user_mode_work(regs, ti_work); |