diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-08-30 20:30:09 +0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-08-30 20:30:09 +0400 |
| commit | 288ceb8f142249109fd2e9f1bf0492bd6ff6d892 (patch) | |
| tree | eab3d229c7a527816db405299ce9603e538b521f /arch/s390/kernel/compat_signal.c | |
| parent | e438befd76a5a743725a89365140a8a7bf276096 (diff) | |
| parent | d8971fcb702e24d1e22c77fd1772f182ffee87e3 (diff) | |
| download | linux-288ceb8f142249109fd2e9f1bf0492bd6ff6d892.tar.xz | |
Auto-update from upstream
Diffstat (limited to 'arch/s390/kernel/compat_signal.c')
| -rw-r--r-- | arch/s390/kernel/compat_signal.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/s390/kernel/compat_signal.c b/arch/s390/kernel/compat_signal.c index d05d65ac9694..7358cdb8441f 100644 --- a/arch/s390/kernel/compat_signal.c +++ b/arch/s390/kernel/compat_signal.c @@ -637,12 +637,11 @@ handle_signal32(unsigned long sig, struct k_sigaction *ka, else setup_frame32(sig, ka, oldset, regs); - if (!(ka->sa.sa_flags & SA_NODEFER)) { - 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_NODEFER)) sigaddset(¤t->blocked,sig); - recalc_sigpending(); - spin_unlock_irq(¤t->sighand->siglock); - } + recalc_sigpending(); + spin_unlock_irq(¤t->sighand->siglock); } |