diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-29 15:59:42 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-29 15:59:42 -0400 |
| commit | 70d374ea9907036e15574a5ce89219edd5baee10 (patch) | |
| tree | b858bb4a841eb91b1d91b41c33698d05fa7bfb37 /arch/h8300/kernel/signal.c | |
| parent | aa7e16d6b88b3b38db0d2ee49ed5e44e7b2045ec (diff) | |
| parent | bf4e70e54cf31dcca48d279c7f7e71328eebe749 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/h8300/kernel/signal.c')
| -rw-r--r-- | arch/h8300/kernel/signal.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/h8300/kernel/signal.c b/arch/h8300/kernel/signal.c index 5aab87eae1f9..f13d5e82d4b9 100644 --- a/arch/h8300/kernel/signal.c +++ b/arch/h8300/kernel/signal.c | |||
| @@ -488,13 +488,12 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka, | |||
| 488 | else | 488 | else |
| 489 | setup_frame(sig, ka, oldset, regs); | 489 | setup_frame(sig, ka, oldset, regs); |
| 490 | 490 | ||
| 491 | if (!(ka->sa.sa_flags & SA_NODEFER)) { | 491 | spin_lock_irq(¤t->sighand->siglock); |
| 492 | spin_lock_irq(¤t->sighand->siglock); | 492 | sigorsets(¤t->blocked,¤t->blocked,&ka->sa.sa_mask); |
| 493 | sigorsets(¤t->blocked,¤t->blocked,&ka->sa.sa_mask); | 493 | if (!(ka->sa.sa_flags & SA_NODEFER)) |
| 494 | sigaddset(¤t->blocked,sig); | 494 | sigaddset(¤t->blocked,sig); |
| 495 | recalc_sigpending(); | 495 | recalc_sigpending(); |
| 496 | spin_unlock_irq(¤t->sighand->siglock); | 496 | spin_unlock_irq(¤t->sighand->siglock); |
| 497 | } | ||
| 498 | } | 497 | } |
| 499 | 498 | ||
| 500 | /* | 499 | /* |