From c191627b559d910d2027add0dc13909ae305342c Mon Sep 17 00:00:00 2001 From: Oleg Nesterov Date: Wed, 22 Jun 2011 23:09:39 +0200 Subject: [PATCH] --- yaml --- r: 256855 b: refs/heads/master c: 0976a03e5ce8ec346e985f21046d7a75bb7fdffd h: refs/heads/master i: 256853: 75b25167f7198e3a0290c4befcd20a90166fa9df 256851: e65783b70c695ccda93cd14b0251a615e47f1c3f 256847: 069d60ffb7f0fe817a0868733ebef876f00b8e7e v: v3 --- [refs] | 2 +- trunk/kernel/exit.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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