pull clearing RESTORE_SIGMASK into block_sigmask()

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

1 files changed, 4 insertions, 7 deletions

diff --git a/arch/avr32/kernel/signal.c b/arch/avr32/kernel/signal.c
index 0e2c0527c9fe..dc7875a0ad79 100644
--- a/arch/avr32/kernel/signal.c
+++ b/arch/avr32/kernel/signal.c
@@ -238,16 +238,13 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,
          */
         ret |= !valid_user_regs(regs);
 
-        if (ret != 0) {
-                force_sigsegv(sig, current);
-                return;
-        }
-
         /*
          * Block the signal if we were successful.
          */
-        block_sigmask(ka, sig);
-        clear_thread_flag(TIF_RESTORE_SIGMASK);
+        if (ret != 0)
+                force_sigsegv(sig, current);
+        else
+                block_sigmask(ka, sig);
 }
 
 /*