Commit eb6bbacc authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'livepatching-for-5.13' of...

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
parents 7f3d08b2 8df1947c
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include <linux/cpu.h> #include <linux/cpu.h>
#include <linux/stacktrace.h> #include <linux/stacktrace.h>
#include <linux/tracehook.h>
#include "core.h" #include "core.h"
#include "patch.h" #include "patch.h"
#include "transition.h" #include "transition.h"
...@@ -369,9 +370,7 @@ static void klp_send_signals(void) ...@@ -369,9 +370,7 @@ static void klp_send_signals(void)
* Send fake signal to all non-kthread tasks which are * Send fake signal to all non-kthread tasks which are
* still not migrated. * still not migrated.
*/ */
spin_lock_irq(&task->sighand->siglock); set_notify_signal(task);
signal_wake_up(task, 0);
spin_unlock_irq(&task->sighand->siglock);
} }
} }
read_unlock(&tasklist_lock); read_unlock(&tasklist_lock);
......
...@@ -43,7 +43,6 @@ ...@@ -43,7 +43,6 @@
#include <linux/cn_proc.h> #include <linux/cn_proc.h>
#include <linux/compiler.h> #include <linux/compiler.h>
#include <linux/posix-timers.h> #include <linux/posix-timers.h>
#include <linux/livepatch.h>
#include <linux/cgroup.h> #include <linux/cgroup.h>
#include <linux/audit.h> #include <linux/audit.h>
...@@ -181,8 +180,7 @@ void recalc_sigpending_and_wake(struct task_struct *t) ...@@ -181,8 +180,7 @@ void recalc_sigpending_and_wake(struct task_struct *t)
void recalc_sigpending(void) void recalc_sigpending(void)
{ {
if (!recalc_sigpending_tsk(current) && !freezing(current) && if (!recalc_sigpending_tsk(current) && !freezing(current))
!klp_patch_pending(current))
clear_thread_flag(TIF_SIGPENDING); clear_thread_flag(TIF_SIGPENDING);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment