--- kernel/exit.c

+++ kernel/exit.c

@@ -54,7 +54,6 @@

#include <asm/unistd.h>

#include <asm/pgtable.h>

#include <asm/mmu_context.h>

-#include "cred-internals.h"

static void exit_mm(struct task_struct * tsk);

@@ -92,6 +91,14 @@ static void __exit_signal(struct task_st

posix_cpu_timers_exit_group(tsk);

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:

*/

@@ -120,7 +127,7 @@ static void __exit_signal(struct task_st

sig->inblock += task_io_get_inblock(tsk);

sig->oublock += task_io_get_oublock(tsk);

task_io_accounting_add(&sig->ioac, &tsk->ioac);

- sig->sum_sched_runtime += tsk->se.sum_exec_runtime;

+ sig->sum_sched_runtime += tsk_seruntime(tsk);

sig = NULL; /* Marker for below. */

}