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/s390/kernel/compat_signal.c | |
| parent | d395bf12d1ba61437e546eb642f0d7ea666123ff (diff) | |
| parent | bf4e70e54cf31dcca48d279c7f7e71328eebe749 (diff) | |
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, | |||
| 637 | else | 637 | else |
| 638 | setup_frame32(sig, ka, oldset, regs); | 638 | setup_frame32(sig, ka, oldset, regs); |
| 639 | 639 | ||
| 640 | if (!(ka->sa.sa_flags & SA_NODEFER)) { | 640 | spin_lock_irq(¤t->sighand->siglock); |
| 641 | spin_lock_irq(¤t->sighand->siglock); | 641 | sigorsets(¤t->blocked,¤t->blocked,&ka->sa.sa_mask); |
| 642 | sigorsets(¤t->blocked,¤t->blocked,&ka->sa.sa_mask); | 642 | if (!(ka->sa.sa_flags & SA_NODEFER)) |
| 643 | sigaddset(¤t->blocked,sig); | 643 | sigaddset(¤t->blocked,sig); |
| 644 | recalc_sigpending(); | 644 | recalc_sigpending(); |
| 645 | spin_unlock_irq(¤t->sighand->siglock); | 645 | spin_unlock_irq(¤t->sighand->siglock); |
| 646 | } | ||
| 647 | } | 646 | } |
| 648 | 647 | ||