From fabc00678085b6531ff3c8e69f83a53a45779846 Mon Sep 17 00:00:00 2001 From: Oleg Nesterov Date: Sun, 2 Mar 2008 21:44:44 +0300 Subject: [PATCH] --- yaml --- r: 86670 b: refs/heads/master c: 821c7de7194e77afee1a69d50830a329a6d9af9f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/exit.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 6855b946d77c..9d8a9d213cf5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 05e83df624fe682bb8571cdb2c6d5284a99c3066 +refs/heads/master: 821c7de7194e77afee1a69d50830a329a6d9af9f diff --git a/trunk/kernel/exit.c b/trunk/kernel/exit.c index 41c1edace97a..cd20bf07e9e3 100644 --- a/trunk/kernel/exit.c +++ b/trunk/kernel/exit.c @@ -750,7 +750,7 @@ static void forget_original_parent(struct task_struct *father) * Send signals to all our closest relatives so that they know * to properly mourn us.. */ -static void exit_notify(struct task_struct *tsk) +static void exit_notify(struct task_struct *tsk, int group_dead) { int state; @@ -766,7 +766,8 @@ static void exit_notify(struct task_struct *tsk) exit_task_namespaces(tsk); write_lock_irq(&tasklist_lock); - kill_orphaned_pgrp(tsk, NULL); + if (group_dead) + kill_orphaned_pgrp(tsk->group_leader, NULL); /* Let father know we died * @@ -981,7 +982,7 @@ NORET_TYPE void do_exit(long code) module_put(tsk->binfmt->module); proc_exit_connector(tsk); - exit_notify(tsk); + exit_notify(tsk, group_dead); #ifdef CONFIG_NUMA mpol_free(tsk->mempolicy); tsk->mempolicy = NULL;