---

yaml --- r: 221583 b: refs/heads/master c: e0a7021 h: refs/heads/master i: 221581: beb5f75 221579: ee22e76 221575: 3d948c5 221567: 372b9b0 v: v3
git-mirror · Nov 5, 2010 · 1055d59 · 1055d59
1 parent a5b77ff
commit 1055d59
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git 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
@@ -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: