commit b7f9a11a6cf1ea9ee6be3eb2b90d91327a09ad14
author Al Viro <viro@zeniv.linux.org.uk> Wed May 02 09:59:21 2012 -0400
committer Al Viro <viro@zeniv.linux.org.uk> Fri Jun 01 12:58:48 2012 -0400
tree 7d5a5f469aea8ac2b3e1ab41e05a6abafcb2b694
parent 51a7b448d4134e3e8eec633435e3e8faee14a828

new helper: sigmask_to_save()

replace boilerplate "should we use ->saved_sigmask or ->blocked?"
with calls of obvious inlined helper...

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

arch/x86/kernel/signal.c

diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
index 25a4a81..56f3062c 100644
--- a/arch/x86/kernel/signal.c
+++ b/arch/x86/kernel/signal.c
@@ -647,12 +647,9 @@
 		struct pt_regs *regs)
 {
 	int usig = signr_convert(sig);
-	sigset_t *set = &current->blocked;
+	sigset_t *set = sigmask_to_save();
 	int ret;
 
-	if (current_thread_info()->status & TS_RESTORE_SIGMASK)
-		set = &current->saved_sigmask;
-
 	/* Set up the stack frame */
 	if (is_ia32) {
 		if (ka->sa.sa_flags & SA_SIGINFO)