git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/home/rmk/linux-2.6-i2c manually
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
kernel
/
signal.c
diff --git
a/arch/arm/kernel/signal.c
b/arch/arm/kernel/signal.c
index 07ddeed61766559c1a6d12b1fb70f92608f31c8c..a94d75fef598b90bc1a65d32dc017bfa184c0059 100644
(file)
--- 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.
*/
/*
* 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);
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);
}
recalc_sigpending();
spin_unlock_irq(&tsk->sighand->siglock);
}
@@
-697,7
+698,7
@@
static int do_signal(sigset_t *oldset, struct pt_regs *regs, int syscall)
if (!user_mode(regs))
return 0;
if (!user_mode(regs))
return 0;
- if (try_to_freeze(
0
))
+ if (try_to_freeze())
goto no_signal;
if (current->ptrace & PT_SINGLESTEP)
goto no_signal;
if (current->ptrace & PT_SINGLESTEP)