1 files changed, 3 insertions, 11 deletions

diff --git a/arch/c6x/kernel/signal.c b/arch/c6x/kernel/signal.c
index bfbcc958bbb4..38bb501eb117 100644
--- a/arch/c6x/kernel/signal.c
+++ b/arch/c6x/kernel/signal.c
@@ -250,8 +250,7 @@ do_restart:
  */
 static int handle_signal(int sig,
                          siginfo_t *info, struct k_sigaction *ka,
-                         sigset_t *oldset, struct pt_regs *regs,
-                         int syscall)
+                         struct pt_regs *regs, int syscall)
 {
         int ret;
 
@@ -278,7 +277,7 @@ static int handle_signal(int sig,
         }
 
         /* Set up the stack frame */
-        ret = setup_rt_frame(sig, ka, info, oldset, regs);
+        ret = setup_rt_frame(sig, ka, info, sigmask_to_save(), regs);
         if (ret == 0)
                 block_sigmask(ka, sig);
 
@@ -292,7 +291,6 @@ static void do_signal(struct pt_regs *regs, int syscall)
 {
         struct k_sigaction ka;
         siginfo_t info;
-        sigset_t *oldset;
         int signr;
 
         /* we want the common case to go fast, which is why we may in certain
@@ -300,15 +298,9 @@ static void do_signal(struct pt_regs *regs, int syscall)
         if (!user_mode(regs))
                 return;
 
-        if (test_thread_flag(TIF_RESTORE_SIGMASK))
-                oldset = &current->saved_sigmask;
-        else
-                oldset = &current->blocked;
-
         signr = get_signal_to_deliver(&info, &ka, regs, NULL);
         if (signr > 0) {
-                if (handle_signal(signr, &info, &ka, oldset,
-                                  regs, syscall) == 0) {
+                if (handle_signal(signr, &info, &ka, regs, syscall) == 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