diff --git a/[refs] b/[refs] index bf5d1c496a5c..a9ec42a7cecd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a54f1655be4cb103a6729adcc9ca914c5fdf1ca0 +refs/heads/master: 1d5d4dbe810befe63e79b2d6cdcad2066e3b1fc4 diff --git a/trunk/arch/score/kernel/signal.c b/trunk/arch/score/kernel/signal.c index a087ad85175a..d4a49011c48a 100644 --- a/trunk/arch/score/kernel/signal.c +++ b/trunk/arch/score/kernel/signal.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include @@ -350,6 +351,12 @@ asmlinkage void do_notify_resume(struct pt_regs *regs, void *unused, __u32 thread_info_flags) { /* deal with pending signal delivery */ - if (thread_info_flags & (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK)) + if (thread_info_flags & _TIF_SIGPENDING) do_signal(regs); + if (thread_info_flags & _TIF_NOTIFY_RESUME) { + clear_thread_flag(TIF_NOTIFY_RESUME); + tracehook_notify_resume(regs); + if (current->replacement_session_keyring) + key_replace_session_keyring(); + } }