---

yaml
---
r: 139691
b: refs/heads/master
c: 0a967a0
h: refs/heads/master
i:
  139689: d0f650d
  139687: 0488aae
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4576145c1ecdaaea9ef8976a48335206aa1ebf91
+refs/heads/master: 0a967a044a777e8b9c739120927114ddc0094298

trunk/kernel/exit.c

@@ -818,22 +818,22 @@ static void reparent_thread(struct task_struct *p, struct task_struct *father)
 
 	list_move_tail(&p->sibling, &p->real_parent->children);
 
+	if (task_detached(p))
+		return;
 	/* If this is a threaded reparent there is no need to
 	 * notify anyone anything has happened.
 	 */
 	if (same_thread_group(p->real_parent, father))
 		return;
 
 	/* We don't want people slaying init.  */
-	if (!task_detached(p))
-		p->exit_signal = SIGCHLD;
+	p->exit_signal = SIGCHLD;
 
 	/* If we'd notified the old parent about this child's death,
 	 * also notify the new parent.
 	 */
 	if (!ptrace_reparented(p) &&
-	    p->exit_state == EXIT_ZOMBIE &&
-	    !task_detached(p) && thread_group_empty(p))
+	    p->exit_state == EXIT_ZOMBIE && thread_group_empty(p))
 		do_notify_parent(p, p->exit_signal);
 
 	kill_orphaned_pgrp(p, father);