diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-29 19:06:29 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-29 19:06:29 -0400 |
| commit | 502c7f1dd566e7ca8aabdb755182664c5fdaebf1 (patch) | |
| tree | 31934a4da45c0cb83acd118a181db4c51967ac8a /arch/m32r/kernel | |
| parent | 2cba582a49f1535c1a12a687cfb3dab713c22cc4 (diff) | |
| parent | 8f3d17fb7bcb7c255197d11469fb5e9695c9d2f4 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/m32r/kernel')
| -rw-r--r-- | arch/m32r/kernel/signal.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/m32r/kernel/signal.c b/arch/m32r/kernel/signal.c index 5aef7e406ef5..71763f7a1d19 100644 --- a/arch/m32r/kernel/signal.c +++ b/arch/m32r/kernel/signal.c | |||
| @@ -341,13 +341,12 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info, | |||
| 341 | /* Set up the stack frame */ | 341 | /* Set up the stack frame */ |
| 342 | setup_rt_frame(sig, ka, info, oldset, regs); | 342 | setup_rt_frame(sig, ka, info, oldset, regs); |
| 343 | 343 | ||
| 344 | if (!(ka->sa.sa_flags & SA_NODEFER)) { | 344 | spin_lock_irq(¤t->sighand->siglock); |
| 345 | spin_lock_irq(¤t->sighand->siglock); | 345 | sigorsets(¤t->blocked,¤t->blocked,&ka->sa.sa_mask); |
| 346 | sigorsets(¤t->blocked,¤t->blocked,&ka->sa.sa_mask); | 346 | if (!(ka->sa.sa_flags & SA_NODEFER)) |
| 347 | sigaddset(¤t->blocked,sig); | 347 | sigaddset(¤t->blocked,sig); |
| 348 | recalc_sigpending(); | 348 | recalc_sigpending(); |
| 349 | spin_unlock_irq(¤t->sighand->siglock); | 349 | spin_unlock_irq(¤t->sighand->siglock); |
| 350 | } | ||
| 351 | } | 350 | } |
| 352 | 351 | ||
| 353 | /* | 352 | /* |