Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
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()
+4
-3
kernel/posix-cpu-timers.c
+4
-3
kernel/posix-cpu-timers.c
···
521
}
522
void posix_cpu_timers_exit_group(struct task_struct *tsk)
523
{
524
-
struct task_cputime cputime;
525
526
-
thread_group_cputimer(tsk, &cputime);
527
cleanup_timers(tsk->signal->cpu_timers,
528
-
cputime.utime, cputime.stime, cputime.sum_exec_runtime);
529
}
530
531
static void clear_dead_task(struct k_itimer *timer, union cpu_time_count now)
···
521
}
522
void posix_cpu_timers_exit_group(struct task_struct *tsk)
523
{
524
+
struct signal_struct *const sig = tsk->signal;
525
526
cleanup_timers(tsk->signal->cpu_timers,
527
+
cputime_add(tsk->utime, sig->utime),
528
+
cputime_add(tsk->stime, sig->stime),
529
+
tsk->se.sum_exec_runtime + sig->sum_sched_runtime);
530
}
531
532
static void clear_dead_task(struct k_itimer *timer, union cpu_time_count now)