summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-08-09 14:57:41 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-08-09 14:57:41 -0700
commit2e9b11afdbfe17a9cc6356076179b7ea11972607 (patch)
treed76b83fec78abd1106c645ae705a5815561e8a34 /kernel
parent95d0ad049cd6937634c0a75f9518f5166daabfce (diff)
parent17d42c1c497aa54952b9e58c1502a46f0df40315 (diff)
downloadlinux-2e9b11afdbfe17a9cc6356076179b7ea11972607.tar.gz
linux-2e9b11afdbfe17a9cc6356076179b7ea11972607.tar.bz2
linux-2e9b11afdbfe17a9cc6356076179b7ea11972607.zip
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()
Diffstat (limited to 'kernel')
-rw-r--r--kernel/posix-cpu-timers.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
index bece7c0b67b2..e33a21cb9407 100644
--- a/kernel/posix-cpu-timers.c
+++ b/kernel/posix-cpu-timers.c
@@ -521,11 +521,12 @@ void posix_cpu_timers_exit(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,
- 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)