diff --git a/[refs] b/[refs] index c995e43ef34b..da8412fe70a4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8677347378044ab564470bced2275520efb3670d +refs/heads/master: 0976a03e5ce8ec346e985f21046d7a75bb7fdffd diff --git a/trunk/kernel/exit.c b/trunk/kernel/exit.c index f68d137ffeb4..2b1ba8048a14 100644 --- a/trunk/kernel/exit.c +++ b/trunk/kernel/exit.c @@ -742,7 +742,7 @@ static void reparent_leader(struct task_struct *father, struct task_struct *p, { list_move_tail(&p->sibling, &p->real_parent->children); - if (task_detached(p)) + if (p->exit_state == EXIT_DEAD) return; /* * If this is a threaded reparent there is no need to