diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-28 03:14:38 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-28 03:14:38 +0200 |
| commit | eb6bbacc46720b8b36eb85b2cdd91b9e691959e4 (patch) | |
| tree | 243fe27af13371bd0167ac4dbf83ab66fed0665f /kernel/signal.c | |
| parent | Merge tag 'printk-for-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | livepatch: Replace the fake signal sending with TIF_NOTIFY_SIGNAL infrastructure (diff) | |
| download | linux-eb6bbacc46720b8b36eb85b2cdd91b9e691959e4.tar.xz linux-eb6bbacc46720b8b36eb85b2cdd91b9e691959e4.zip | |
Merge tag 'livepatching-for-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching
Pull livepatching update from Petr Mladek:
- Use TIF_NOTIFY_SIGNAL infrastructure instead of the fake signal
* tag 'livepatching-for-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching:
livepatch: Replace the fake signal sending with TIF_NOTIFY_SIGNAL infrastructure
Diffstat (limited to 'kernel/signal.c')
| -rw-r--r-- | kernel/signal.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel/signal.c b/kernel/signal.c index f2718350bf4b..e528f96eebc8 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -43,7 +43,6 @@ #include <linux/cn_proc.h> #include <linux/compiler.h> #include <linux/posix-timers.h> -#include <linux/livepatch.h> #include <linux/cgroup.h> #include <linux/audit.h> @@ -181,8 +180,7 @@ void recalc_sigpending_and_wake(struct task_struct *t) void recalc_sigpending(void) { - if (!recalc_sigpending_tsk(current) && !freezing(current) && - !klp_patch_pending(current)) + if (!recalc_sigpending_tsk(current) && !freezing(current)) clear_thread_flag(TIF_SIGPENDING); } |