Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livep...

[linux.git] / kernel / signal.c

diff --git a/kernel/signal.c b/kernel/signal.c
index e549174c0831374be6ddf7af6ea5b4907a9ae90c..c6e4c83dc090ab1361ee9c229f8ff185295c2f46 100644 (file)
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -40,6 +40,7 @@
 #include <linux/cn_proc.h>
 #include <linux/compiler.h>
 #include <linux/posix-timers.h>
+#include <linux/livepatch.h>
 
 #define CREATE_TRACE_POINTS
 #include <trace/events/signal.h>
@@ -165,7 +166,8 @@ void recalc_sigpending_and_wake(struct task_struct *t)
 
 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);
 
 }