Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 295263
b: refs/heads/master
c: 629d362
h: refs/heads/master
i:
  295261: 78b82d0
  295259: 7b1d19c
  295255: 346dd81
  295247: 18fe842
  295231: 47df4a3
v: v3
  • Loading branch information
Oleg Nesterov authored and Linus Torvalds committed Mar 23, 2012
1 parent 4561d91 commit 7f3f451
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 43aca3246cb7f736b20c11da9ce932a124a2a85a
refs/heads/master: 629d362b9950166c6fac2aa8425db34d824bb043
3 changes: 2 additions & 1 deletion trunk/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -1059,7 +1059,8 @@ static int __send_signal(int sig, struct siginfo *info, struct task_struct *t,
assert_spin_locked(&t->sighand->siglock);

result = TRACE_SIGNAL_IGNORED;
if (!prepare_signal(sig, t, from_ancestor_ns))
if (!prepare_signal(sig, t,
from_ancestor_ns || (info == SEND_SIG_FORCED)))
goto ret;

pending = group ? &t->signal->shared_pending : &t->pending;
Expand Down

0 comments on commit 7f3f451

Please sign in to comment.