diff options
author | Jiri Kosina <jkosina@suse.cz> | 2017-05-01 22:49:28 +0300 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2017-05-01 22:49:28 +0300 |
commit | a0841609f658c77f066af9c61a2e13143564fcb4 (patch) | |
tree | 0f0df468b6f852501cd4ed1570701e695b9f5d56 /arch/powerpc/kernel/signal.c | |
parent | 77f8f39a2e463eca89a19b916189d0e4e38f75d8 (diff) | |
parent | e679af627fe875a51d40b9a2b17f08fbde36e0e2 (diff) | |
download | linux-a0841609f658c77f066af9c61a2e13143564fcb4.tar.xz |
Merge branches 'for-4.12/upstream' and 'for-4.12/klp-hybrid-consistency-model' into for-linus
Diffstat (limited to 'arch/powerpc/kernel/signal.c')
-rw-r--r-- | arch/powerpc/kernel/signal.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/signal.c b/arch/powerpc/kernel/signal.c index 3a3671172436..e9436c5e1e09 100644 --- a/arch/powerpc/kernel/signal.c +++ b/arch/powerpc/kernel/signal.c @@ -14,6 +14,7 @@ #include <linux/uprobes.h> #include <linux/key.h> #include <linux/context_tracking.h> +#include <linux/livepatch.h> #include <asm/hw_breakpoint.h> #include <linux/uaccess.h> #include <asm/unistd.h> @@ -162,6 +163,9 @@ void do_notify_resume(struct pt_regs *regs, unsigned long thread_info_flags) tracehook_notify_resume(regs); } + if (thread_info_flags & _TIF_PATCH_PENDING) + klp_update_patch_state(current); + user_enter(); } |