pull clearing RESTORE_SIGMASK into block_sigmask()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
index 2e66c93..7f9abd7 100644
--- a/arch/arm/kernel/signal.c
+++ b/arch/arm/kernel/signal.c
@@ -528,7 +528,7 @@
/*
* OK, we're invoking a handler
*/
-static int
+static void
handle_signal(unsigned long sig, struct k_sigaction *ka,
siginfo_t *info, struct pt_regs *regs)
{
@@ -559,17 +559,14 @@
if (ret != 0) {
force_sigsegv(sig, tsk);
- return ret;
+ return;
}
/*
* Block the signal if we were successful.
*/
block_sigmask(ka, sig);
-
tracehook_signal_handler(sig, info, ka, regs, 0);
-
- return 0;
}
/*
@@ -633,16 +630,7 @@
clear_thread_flag(TIF_SYSCALL_RESTARTSYS);
}
- if (handle_signal(signr, &ka, &info, 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);
- }
+ handle_signal(signr, &ka, &info, regs);
return;
}