TIF_RESTORE_SIGMASK can be set only when TIF_SIGPENDING is set

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

2 files changed, 1 insertions, 3 deletions

diff --git a/arch/blackfin/kernel/signal.c b/arch/blackfin/kernel/signal.c
index 93d1ecd9213c..b20d435d084a 100644
--- a/arch/blackfin/kernel/signal.c
+++ b/arch/blackfin/kernel/signal.c
@@ -307,7 +307,7 @@ asmlinkage void do_signal(struct pt_regs *regs)
  */
 asmlinkage void do_notify_resume(struct pt_regs *regs)
 {
-        if (test_thread_flag(TIF_SIGPENDING) || test_thread_flag(TIF_RESTORE_SIGMASK))
+        if (test_thread_flag(TIF_SIGPENDING))
                 do_signal(regs);
 
         if (test_thread_flag(TIF_NOTIFY_RESUME)) {
diff --git a/arch/blackfin/mach-common/entry.S b/arch/blackfin/mach-common/entry.S
index 80aa2535e2c9..04c2fbe41a7f 100644
--- a/arch/blackfin/mach-common/entry.S
+++ b/arch/blackfin/mach-common/entry.S
@@ -711,8 +711,6 @@ ENTRY(_system_call)
         jump .Lresume_userspace_1;
 
 .Lsyscall_sigpending:
-        cc = BITTST(r7, TIF_RESTORE_SIGMASK);
-        if cc jump .Lsyscall_do_signals;
         cc = BITTST(r7, TIF_SIGPENDING);
         if cc jump .Lsyscall_do_signals;
         cc = BITTST(r7, TIF_NOTIFY_RESUME);