Auto-update from upstream

1 files changed, 5 insertions, 6 deletions

diff --git a/arch/xtensa/kernel/signal.c b/arch/xtensa/kernel/signal.c
index df6e1e17b096..dc42cede9394 100644
--- a/arch/xtensa/kernel/signal.c
+++ b/arch/xtensa/kernel/signal.c
@@ -702,12 +702,11 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset)
         if (ka.sa.sa_flags & SA_ONESHOT)
                 ka.sa.sa_handler = SIG_DFL;
 
-        if (!(ka.sa.sa_flags & SA_NODEFER)) {
-                spin_lock_irq(&current->sighand->siglock);
-                sigorsets(&current->blocked, &current->blocked, &ka.sa.sa_mask);
+        spin_lock_irq(&current->sighand->siglock);
+        sigorsets(&current->blocked, &current->blocked, &ka.sa.sa_mask);
+        if (!(ka.sa.sa_flags & SA_NODEFER))
                 sigaddset(&current->blocked, signr);
-                recalc_sigpending();
-                spin_unlock_irq(&current->sighand->siglock);
-        }
+        recalc_sigpending();
+        spin_unlock_irq(&current->sighand->siglock);
         return 1;
 }