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/ia64 | |
| parent | d395bf12d1ba61437e546eb642f0d7ea666123ff (diff) | |
| parent | bf4e70e54cf31dcca48d279c7f7e71328eebe749 (diff) | |
| download | kernel_samsung_smdk4412-27a639a92d3289c4851105efcbc2f8b88969194f.tar.gz kernel_samsung_smdk4412-27a639a92d3289c4851105efcbc2f8b88969194f.tar.bz2 kernel_samsung_smdk4412-27a639a92d3289c4851105efcbc2f8b88969194f.zip | |
Auto-update from upstream
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/kernel/signal.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/arch/ia64/kernel/signal.c b/arch/ia64/kernel/signal.c index b8a0a7d257a..774f34b675c 100644 --- a/arch/ia64/kernel/signal.c +++ b/arch/ia64/kernel/signal.c @@ -467,15 +467,12 @@ handle_signal (unsigned long sig, struct k_sigaction *ka, siginfo_t *info, sigse if (!setup_frame(sig, ka, info, oldset, scr)) return 0; - if (!(ka->sa.sa_flags & SA_NODEFER)) { - spin_lock_irq(¤t->sighand->siglock); - { - sigorsets(¤t->blocked, ¤t->blocked, &ka->sa.sa_mask); - sigaddset(¤t->blocked, sig); - recalc_sigpending(); - } - spin_unlock_irq(¤t->sighand->siglock); - } + 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); return 1; } |