Merge upstream kernel into libata 'passthru' branch

1 files changed, 3 insertions, 3 deletions

diff --git a/arch/um/kernel/signal_kern.c b/arch/um/kernel/signal_kern.c
index 7807a3e8c426..03618bd13d55 100644
--- a/arch/um/kernel/signal_kern.c
+++ b/arch/um/kernel/signal_kern.c
@@ -87,12 +87,12 @@ static int handle_signal(struct pt_regs *regs, unsigned long signr,
                 recalc_sigpending();
                 spin_unlock_irq(&current->sighand->siglock);
                 force_sigsegv(signr, current);
-        }
-        else if(!(ka->sa.sa_flags & SA_NODEFER)){
+        } else {
                 spin_lock_irq(&current->sighand->siglock);
                 sigorsets(&current->blocked, &current->blocked, 
                           &ka->sa.sa_mask);
-                sigaddset(&current->blocked, signr);
+                 if(!(ka->sa.sa_flags & SA_NODEFER))
+                        sigaddset(&current->blocked, signr);
                 recalc_sigpending();
                 spin_unlock_irq(&current->sighand->siglock);
         }