Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e9b11af authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'timers-fixes-for-linus' of... 

Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  posix_cpu_timers_exit_group(): Do not use thread_group_cputimer()
parents 95d0ad04 17d42c1c

kernel/posix-cpu-timers.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -521,11 +521,12 @@ void posix_cpu_timers_exit(struct task_struct *tsk) 
}

}

void posix_cpu_timers_exit_group(struct task_struct *tsk)

void posix_cpu_timers_exit_group(struct task_struct *tsk)

{

{

	struct task_cputime cputime;

	struct signal_struct *const sig = tsk->signal;





	thread_group_cputimer(tsk, &cputime);

	cleanup_timers(tsk->signal->cpu_timers,

	cleanup_timers(tsk->signal->cpu_timers,

		       cputime.utime, cputime.stime, cputime.sum_exec_runtime);

		       cputime_add(tsk->utime, sig->utime),

		       cputime_add(tsk->stime, sig->stime),

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

}

}





static void clear_dead_task(struct k_itimer *timer, union cpu_time_count now)

static void clear_dead_task(struct k_itimer *timer, union cpu_time_count now)