Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

1 files changed, 3 insertions, 2 deletions

diff --git a/arch/x86_64/kernel/signal.c b/arch/x86_64/kernel/signal.c
index 98590a989f3d..d642fbf3da29 100644
--- a/arch/x86_64/kernel/signal.c
+++ b/arch/x86_64/kernel/signal.c
@@ -394,10 +394,11 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka,
 #endif
         ret = setup_rt_frame(sig, ka, info, oldset, regs);
 
-        if (ret && !(ka->sa.sa_flags & SA_NODEFER)) {
+        if (ret) {
                 spin_lock_irq(&current->sighand->siglock);
                 sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);
-                sigaddset(&current->blocked,sig);
+                if (!(ka->sa.sa_flags & SA_NODEFER))
+                        sigaddset(&current->blocked,sig);
                 recalc_sigpending();
                 spin_unlock_irq(&current->sighand->siglock);
         }