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/m68knommu/kernel/signal.c | |
| parent | 2cba582a49f1535c1a12a687cfb3dab713c22cc4 (diff) | |
| parent | 8f3d17fb7bcb7c255197d11469fb5e9695c9d2f4 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/m68knommu/kernel/signal.c')
| -rw-r--r-- | arch/m68knommu/kernel/signal.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/m68knommu/kernel/signal.c b/arch/m68knommu/kernel/signal.c index 30dceb59a462..43a2726c0d0a 100644 --- a/arch/m68knommu/kernel/signal.c +++ b/arch/m68knommu/kernel/signal.c | |||
| @@ -732,13 +732,12 @@ handle_signal(int sig, struct k_sigaction *ka, siginfo_t *info, | |||
| 732 | if (ka->sa.sa_flags & SA_ONESHOT) | 732 | if (ka->sa.sa_flags & SA_ONESHOT) |
| 733 | ka->sa.sa_handler = SIG_DFL; | 733 | ka->sa.sa_handler = SIG_DFL; |
| 734 | 734 | ||
| 735 | if (!(ka->sa.sa_flags & SA_NODEFER)) { | 735 | spin_lock_irq(¤t->sighand->siglock); |
| 736 | spin_lock_irq(¤t->sighand->siglock); | 736 | sigorsets(¤t->blocked,¤t->blocked,&ka->sa.sa_mask); |
| 737 | sigorsets(¤t->blocked,¤t->blocked,&ka->sa.sa_mask); | 737 | if (!(ka->sa.sa_flags & SA_NODEFER)) |
| 738 | sigaddset(¤t->blocked,sig); | 738 | sigaddset(¤t->blocked,sig); |
| 739 | recalc_sigpending(); | 739 | recalc_sigpending(); |
| 740 | spin_unlock_irq(¤t->sighand->siglock); | 740 | spin_unlock_irq(¤t->sighand->siglock); |
| 741 | } | ||
| 742 | } | 741 | } |
| 743 | 742 | ||
| 744 | /* | 743 | /* |