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>

1 files changed, 1 insertions, 4 deletions

diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
index 25a4a81a51aa..56f3062c5111 100644
--- a/arch/x86/kernel/signal.c
+++ b/arch/x86/kernel/signal.c
@@ -647,12 +647,9 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
                 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)