]> err.no Git - linux-2.6/commit
sched: accounting regression since rc1
authorChristian Borntraeger <borntraeger@de.ibm.com>
Thu, 23 Aug 2007 13:18:02 +0000 (15:18 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 23 Aug 2007 13:18:02 +0000 (15:18 +0200)
commitefe567fc8281661524ffa75477a7c4ca9b466c63
treed545f25d113646491e75bd09b521dfa6db5f0276
parentc57baf1e1e24b004b57d282267542baab802753c
sched: accounting regression since rc1

Fix the accounting regression for CONFIG_VIRT_CPU_ACCOUNTING.  It
reverts parts of commit b27f03d4bdc145a09fb7b0c0e004b29f1ee555fa by
converting fs/proc/array.c back to cputime_t.  The new functions
task_utime and task_stime now return cputime_t instead of clock_t.  If
CONFIG_VIRT_CPU_ACCOUTING is set, task->utime and task->stime are
returned directly instead of using sum_exec_runtime.

Patch is tested on s390x with and without VIRT_CPU_ACCOUTING as well as
on i386.

[ mingo@elte.hu: cleanups, comments. ]

Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
fs/proc/array.c