From 4bd427f686784428869e7846ba7fe27a09ceb165 Mon Sep 17 00:00:00 2001 From: Oleg Nesterov Date: Wed, 14 Mar 2012 19:55:38 +0100 Subject: [PATCH] --- yaml --- r: 289711 b: refs/heads/master c: 5f8aadd8b9966d71a77bba52b9d499cc2f38269f h: refs/heads/master i: 289709: 48618969bac7c24f96ae0f8dbb7b9bc69d095ac3 289707: 2e45b9d98215003f30d9d179a31cb3180724a7aa 289703: 1ad3a05305e457b023b5e6e803f369f1911543fb 289695: ff34395980661f178a286741d459ff6dfb64488d v: v3 --- [refs] | 2 +- trunk/kernel/fork.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4b65a39f3a49..bfbfbc4c9cfe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ed378a52dabf77b406b447fd3238f83ea24b71fa +refs/heads/master: 5f8aadd8b9966d71a77bba52b9d499cc2f38269f diff --git a/trunk/kernel/fork.c b/trunk/kernel/fork.c index 26a7a6707fa7..c4f38a849436 100644 --- a/trunk/kernel/fork.c +++ b/trunk/kernel/fork.c @@ -1340,7 +1340,13 @@ static struct task_struct *copy_process(unsigned long clone_flags, clear_all_latency_tracing(p); /* ok, now we should be set up.. */ - p->exit_signal = (clone_flags & CLONE_THREAD) ? -1 : (clone_flags & CSIGNAL); + if (clone_flags & CLONE_THREAD) + p->exit_signal = -1; + else if (clone_flags & CLONE_PARENT) + p->exit_signal = current->group_leader->exit_signal; + else + p->exit_signal = (clone_flags & CSIGNAL); + p->pdeath_signal = 0; p->exit_state = 0;