diff options
| author | Len Brown <len.brown@intel.com> | 2005-08-29 17:02:17 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-29 17:02:17 -0400 |
| commit | 27a639a92d3289c4851105efcbc2f8b88969194f (patch) | |
| tree | 09ee327d3ed3e2c40d5dc3b0f6b283477282deec /arch/v850/kernel/signal.c | |
| parent | d395bf12d1ba61437e546eb642f0d7ea666123ff (diff) | |
| parent | bf4e70e54cf31dcca48d279c7f7e71328eebe749 (diff) | |
Auto-update from upstream
Diffstat (limited to 'arch/v850/kernel/signal.c')
| -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 | /* |