diff options
| author | Len Brown <len.brown@intel.com> | 2005-08-29 23:02:17 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-29 23:02:17 +0200 |
| commit | 27a639a92d3289c4851105efcbc2f8b88969194f (patch) | |
| tree | 09ee327d3ed3e2c40d5dc3b0f6b283477282deec /arch/arm/kernel/signal.c | |
| parent | [ACPI] Reduce acpi-cpufreq switching latency by 50% (diff) | |
| parent | [PATCH] missing include in smc-ultra (diff) | |
| download | linux-27a639a92d3289c4851105efcbc2f8b88969194f.tar.xz linux-27a639a92d3289c4851105efcbc2f8b88969194f.zip | |
Auto-update from upstream
Diffstat (limited to 'arch/arm/kernel/signal.c')
| -rw-r--r-- | arch/arm/kernel/signal.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c index 5e435e42dacd..a94d75fef598 100644 --- a/arch/arm/kernel/signal.c +++ b/arch/arm/kernel/signal.c @@ -658,11 +658,12 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, /* * Block the signal if we were unsuccessful. */ - if (ret != 0 || !(ka->sa.sa_flags & SA_NODEFER)) { + if (ret != 0) { spin_lock_irq(&tsk->sighand->siglock); sigorsets(&tsk->blocked, &tsk->blocked, &ka->sa.sa_mask); - sigaddset(&tsk->blocked, sig); + if (!(ka->sa.sa_flags & SA_NODEFER)) + sigaddset(&tsk->blocked, sig); recalc_sigpending(); spin_unlock_irq(&tsk->sighand->siglock); } |