---

yaml --- r: 289711 b: refs/heads/master c: 5f8aadd h: refs/heads/master i: 289709: 4861896 289707: 2e45b9d 289703: 1ad3a05 289695: ff34395 v: v3
git-mirror · Mar 20, 2012 · 4bd427f · 4bd427f
1 parent 0068770
commit 4bd427f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git 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
@@ -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;