From 7f3f4517336755f41cecf000ff802a08276a1ab5 Mon Sep 17 00:00:00 2001 From: Oleg Nesterov Date: Fri, 23 Mar 2012 15:02:44 -0700 Subject: [PATCH] --- yaml --- r: 295263 b: refs/heads/master c: 629d362b9950166c6fac2aa8425db34d824bb043 h: refs/heads/master i: 295261: 78b82d0e91697c66fce55d8e4ad29728e1b055da 295259: 7b1d19cf866c7086a92f50b35f9b529a752da3c4 295255: 346dd81ecd4dab42eeb199b20faf67c9948785da 295247: 18fe8429cc53bbba215d69ab8c6293230095df70 295231: 47df4a30286b2b02c3399aa6f420111cfa6e8f3a v: v3 --- [refs] | 2 +- trunk/kernel/signal.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8a21564d5c16..b5bd95fed7ed 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 43aca3246cb7f736b20c11da9ce932a124a2a85a +refs/heads/master: 629d362b9950166c6fac2aa8425db34d824bb043 diff --git a/trunk/kernel/signal.c b/trunk/kernel/signal.c index e76001ccf5cd..2584f5a91fbe 100644 --- a/trunk/kernel/signal.c +++ b/trunk/kernel/signal.c @@ -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;