diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-29 19:59:42 (GMT) |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-29 19:59:42 (GMT) |
| commit | 70d374ea9907036e15574a5ce89219edd5baee10 (patch) | |
| tree | b858bb4a841eb91b1d91b41c33698d05fa7bfb37 /arch/v850 | |
| parent | aa7e16d6b88b3b38db0d2ee49ed5e44e7b2045ec (diff) | |
| parent | bf4e70e54cf31dcca48d279c7f7e71328eebe749 (diff) | |
| download | linux-fsl-qoriq-70d374ea9907036e15574a5ce89219edd5baee10.tar.xz | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/v850')
| -rw-r--r-- | arch/v850/kernel/signal.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/v850/kernel/signal.c b/arch/v850/kernel/signal.c index 37061e3..633e4e1 100644 --- a/arch/v850/kernel/signal.c +++ b/arch/v850/kernel/signal.c @@ -462,13 +462,12 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka, else setup_frame(sig, ka, oldset, regs); - if (!(ka->sa.sa_flags & SA_NODEFER)) { - spin_lock_irq(¤t->sighand->siglock); - sigorsets(¤t->blocked,¤t->blocked,&ka->sa.sa_mask); + spin_lock_irq(¤t->sighand->siglock); + sigorsets(¤t->blocked,¤t->blocked,&ka->sa.sa_mask); + if (!(ka->sa.sa_flags & SA_NODEFER)) sigaddset(¤t->blocked,sig); - recalc_sigpending(); - spin_unlock_irq(¤t->sighand->siglock); - } + recalc_sigpending(); + spin_unlock_irq(¤t->sighand->siglock); } /* |