diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-29 21:59:42 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-29 21:59:42 +0200 |
| commit | 70d374ea9907036e15574a5ce89219edd5baee10 (patch) | |
| tree | b858bb4a841eb91b1d91b41c33698d05fa7bfb37 /arch/sparc64/kernel/signal32.c | |
| parent | [libata sata_nv] NVIDIA ok'd license change from OSL+GPL to GPL (diff) | |
| parent | [PATCH] missing include in smc-ultra (diff) | |
| download | linux-70d374ea9907036e15574a5ce89219edd5baee10.tar.xz linux-70d374ea9907036e15574a5ce89219edd5baee10.zip | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/sparc64/kernel/signal32.c')
| -rw-r--r-- | arch/sparc64/kernel/signal32.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/sparc64/kernel/signal32.c b/arch/sparc64/kernel/signal32.c index f28428f4170e..b1ed23091fbb 100644 --- a/arch/sparc64/kernel/signal32.c +++ b/arch/sparc64/kernel/signal32.c @@ -1325,13 +1325,12 @@ static inline void handle_signal32(unsigned long signr, struct k_sigaction *ka, else setup_frame32(&ka->sa, regs, signr, oldset, info); } - if (!(ka->sa.sa_flags & SA_NOMASK)) { - spin_lock_irq(¤t->sighand->siglock); - sigorsets(¤t->blocked,¤t->blocked,&ka->sa.sa_mask); + spin_lock_irq(¤t->sighand->siglock); + sigorsets(¤t->blocked,¤t->blocked,&ka->sa.sa_mask); + if (!(ka->sa.sa_flags & SA_NOMASK)) sigaddset(¤t->blocked,signr); - recalc_sigpending(); - spin_unlock_irq(¤t->sighand->siglock); - } + recalc_sigpending(); + spin_unlock_irq(¤t->sighand->siglock); } static inline void syscall_restart32(unsigned long orig_i0, struct pt_regs *regs, |