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, 3 insertions, 4 deletions

diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S
index c7fbc96472f3..18670a078849 100644
--- a/arch/parisc/kernel/entry.S
+++ b/arch/parisc/kernel/entry.S
@@ -924,7 +924,7 @@ intr_check_sig:
         /* As above */
         mfctl   %cr30,%r1
         LDREG   TI_FLAGS(%r1),%r19
-        ldi     (_TIF_SIGPENDING|_TIF_RESTORE_SIGMASK|_TIF_NOTIFY_RESUME), %r20
+        ldi     (_TIF_SIGPENDING|_TIF_NOTIFY_RESUME), %r20
         and,COND(<>)    %r19, %r20, %r0
         b,n     intr_restore    /* skip past if we've nothing to do */
 
@@ -2032,7 +2032,7 @@ syscall_check_resched:
         .import do_signal,code
 syscall_check_sig:
         LDREG   TI_FLAGS-THREAD_SZ_ALGN-FRAME_SIZE(%r30),%r19
-        ldi     (_TIF_SIGPENDING|_TIF_RESTORE_SIGMASK|_TIF_NOTIFY_RESUME), %r26
+        ldi     (_TIF_SIGPENDING|_TIF_NOTIFY_RESUME), %r26
         and,COND(<>)    %r19, %r26, %r0
         b,n     syscall_restore /* skip past if we've nothing to do */
 
diff --git a/arch/parisc/kernel/signal.c b/arch/parisc/kernel/signal.c
index d6ddc572eba1..7f3c8f2c962d 100644
--- a/arch/parisc/kernel/signal.c
+++ b/arch/parisc/kernel/signal.c
@@ -613,8 +613,7 @@ do_signal(struct pt_regs *regs, long in_syscall)
 
 void do_notify_resume(struct pt_regs *regs, long in_syscall)
 {
-        if (test_thread_flag(TIF_SIGPENDING) ||
-            test_thread_flag(TIF_RESTORE_SIGMASK))
+        if (test_thread_flag(TIF_SIGPENDING))
                 do_signal(regs, in_syscall);
 
         if (test_thread_flag(TIF_NOTIFY_RESUME)) {