pull clearing RESTORE_SIGMASK into block_sigmask()

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

1 files changed, 5 insertions, 13 deletions

diff --git a/arch/mn10300/kernel/signal.c b/arch/mn10300/kernel/signal.c
index 26a1d98c62a1..1715478f4e94 100644
--- a/arch/mn10300/kernel/signal.c
+++ b/arch/mn10300/kernel/signal.c
@@ -462,11 +462,12 @@ static int handle_signal(int sig,
                 ret = setup_rt_frame(sig, ka, info, oldset, regs);
         else
                 ret = setup_frame(sig, ka, oldset, regs);
+        if (ret)
+                return;
 
-        if (ret == 0)
-                block_sigmask(ka, sig);
-
-        return ret;
+        block_sigmask(ka, sig);
+        tracehook_signal_handler(sig, info, ka, regs,
+                                 test_thread_flag(TIF_SINGLESTEP));
 }
 
 /*
@@ -486,15 +487,6 @@ static void do_signal(struct pt_regs *regs)
         signr = get_signal_to_deliver(&info, &ka, regs, NULL);
         if (signr > 0) {
                 if (handle_signal(signr, &info, &ka, regs) == 0) {
-                        /* a signal was successfully delivered; the saved
-                         * sigmask will have been stored in the signal frame,
-                         * and will be restored by sigreturn, so we can simply
-                         * clear the TIF_RESTORE_SIGMASK flag */
-                        if (test_thread_flag(TIF_RESTORE_SIGMASK))
-                                clear_thread_flag(TIF_RESTORE_SIGMASK);
-
-                        tracehook_signal_handler(signr, &info, &ka, regs,
-                                                 test_thread_flag(TIF_SINGLESTEP));
                 }
 
                 return;