From 1055d594cb09a39cc5bf916ec8a36a2ee152eee3 Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@redhat.com>
Date: Fri, 5 Nov 2010 16:53:42 +0100
Subject: [PATCH] --- yaml --- r: 221583 b: refs/heads/master c:
 e0a70217107e6f9844628120412cb27bb4cea194 h: refs/heads/master i:   221581:
 beb5f750c955cb36a471be5110983593fe8cb993   221579:
 ee22e762238ddcb97f8870827b5f57466095fba8   221575:
 3d948c55f16ca41c0ac8478e6d5d22b5c8b5da29   221567:
 372b9b0da3985b20d524335fa12b2c6e733f6a1a v: v3

---
 [refs]              | 2 +-
 trunk/kernel/exit.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5f84a74ed467..b5e33320c985 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b312e131cb88b83b6edc7a017b0249b4ea176edc
+refs/heads/master: e0a70217107e6f9844628120412cb27bb4cea194
diff --git a/trunk/kernel/exit.c b/trunk/kernel/exit.c
index b194febf5799..21aa7b3001fb 100644
--- a/trunk/kernel/exit.c
+++ b/trunk/kernel/exit.c
@@ -95,6 +95,14 @@ static void __exit_signal(struct task_struct *tsk)
 		tty = sig->tty;
 		sig->tty = NULL;
 	} else {
+		/*
+		 * This can only happen if the caller is de_thread().
+		 * FIXME: this is the temporary hack, we should teach
+		 * posix-cpu-timers to handle this case correctly.
+		 */
+		if (unlikely(has_group_leader_pid(tsk)))
+			posix_cpu_timers_exit_group(tsk);
+
 		/*
 		 * If there is any task waiting for the group exit
 		 * then notify it: