diff --git a/[refs] b/[refs] index 468db2d3db12..358a67c0db5f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d738752fc46c4cc339bc66346cf6134446ce08db +refs/heads/master: 3b6362b833b9f7a9d4222cf1bb35f99c411abb31 diff --git a/trunk/kernel/exit.c b/trunk/kernel/exit.c index a4c19a52ce46..d891883420f7 100644 --- a/trunk/kernel/exit.c +++ b/trunk/kernel/exit.c @@ -1053,7 +1053,7 @@ static int eligible_child(pid_t pid, int options, struct task_struct *p) * Do not consider thread group leaders that are * in a non-empty thread group: */ - if (current->tgid != p->tgid && delay_group_leader(p)) + if (delay_group_leader(p)) return 2; if (security_task_wait(p))