diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-08-30 18:30:09 +0200 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-08-30 18:30:09 +0200 |
| commit | 288ceb8f142249109fd2e9f1bf0492bd6ff6d892 (patch) | |
| tree | eab3d229c7a527816db405299ce9603e538b521f /arch/ia64 | |
| parent | [IA64-SGI] One new use of "UNCACHED" needed fixing for sn2 region cleanup (diff) | |
| parent | [INET]: compile errors when DEBUG is defined (diff) | |
| download | linux-288ceb8f142249109fd2e9f1bf0492bd6ff6d892.tar.xz linux-288ceb8f142249109fd2e9f1bf0492bd6ff6d892.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 b8a0a7d257a9..774f34b675cf 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; } |