diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-29 19:10:39 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-29 19:10:39 -0400 |
| commit | 739cdbf1d8f0739b80035b80d69d871e33749b86 (patch) | |
| tree | 15134df8723ab7d7a5524c99070f02d5739bad0d /arch/v850 | |
| parent | 83bbecc905b3431c60fe282830e09aaaab97b26a (diff) | |
| parent | 8f3d17fb7bcb7c255197d11469fb5e9695c9d2f4 (diff) | |
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 37061e32e1a4..633e4e1b825f 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, | |||
| 462 | else | 462 | else |
| 463 | setup_frame(sig, ka, oldset, regs); | 463 | setup_frame(sig, ka, oldset, regs); |
| 464 | 464 | ||
| 465 | if (!(ka->sa.sa_flags & SA_NODEFER)) { | 465 | spin_lock_irq(¤t->sighand->siglock); |
| 466 | spin_lock_irq(¤t->sighand->siglock); | 466 | sigorsets(¤t->blocked,¤t->blocked,&ka->sa.sa_mask); |
| 467 | sigorsets(¤t->blocked,¤t->blocked,&ka->sa.sa_mask); | 467 | if (!(ka->sa.sa_flags & SA_NODEFER)) |
| 468 | sigaddset(¤t->blocked,sig); | 468 | sigaddset(¤t->blocked,sig); |
| 469 | recalc_sigpending(); | 469 | recalc_sigpending(); |
| 470 | spin_unlock_irq(¤t->sighand->siglock); | 470 | spin_unlock_irq(¤t->sighand->siglock); |
| 471 | } | ||
| 472 | } | 471 | } |
| 473 | 472 | ||
| 474 | /* | 473 | /* |