Merge osdl.org:/home/mochel/src/kernel/linux-2.5-virgin

into osdl.org:/home/mochel/src/kernel/linux-2.5-power

1 files changed, 4 insertions, 2 deletions

diff --git a/kernel/signal.c b/kernel/signal.c
index bab76d941a3d..cd83653ef5d2 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -1011,9 +1011,11 @@ void zap_other_threads(struct task_struct *p)
 		 * killed as part of a thread group due to another
 		 * thread doing an execve() or similar. So set the
 		 * exit signal to -1 to allow immediate reaping of
-		 * the process.
+		 * the process.  But don't detach the thread group
+		 * leader.
 		 */
-		t->exit_signal = -1;
+		if (t != p->group_leader)
+			t->exit_signal = -1;
 
 		sigaddset(&t->pending.signal, SIGKILL);
 		rm_from_queue(SIG_KERNEL_STOP_MASK, &t->pending);