diff options
| author |   Balbir Singh <balbir@linux.vnet.ibm.com> | 2007-10-30 00:26:32 +0100 |
|---|---|---|
| committer |   Ingo Molnar <mingo@elte.hu> | 2007-10-30 00:26:32 +0100 |
| commit | 9301899be75b464ef097f0b5af7af6d9bd8f68a7 (patch) | |
| tree | a7053c5c0babcdbad6d4baff0551d60e5c4308af /fs/proc | |
| parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff) | |
| download | linux-dev-9301899be75b464ef097f0b5af7af6d9bd8f68a7.tar.xz linux-dev-9301899be75b464ef097f0b5af7af6d9bd8f68a7.zip | |
sched: fix /proc/<PID>/stat stime/utime monotonicity, part 2
Extend Peter's patch to fix accounting issues, by keeping stime
monotonic too.
Signed-off-by: Balbir Singh <balbir@linux.vnet.ibm.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Tested-by: Frans Pop <elendil@planet.nl>
Diffstat (limited to '')
| -rw-r--r-- | fs/proc/array.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/proc/array.c b/fs/proc/array.c index d80baaabf835..eba339ecba27 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c @@ -374,7 +374,8 @@ static cputime_t task_stime(struct task_struct *p) stime = nsec_to_clock_t(p->se.sum_exec_runtime) - cputime_to_clock_t(task_utime(p)); - return clock_t_to_cputime(stime); + p->prev_stime = max(p->prev_stime, clock_t_to_cputime(stime)); + return p->prev_stime; } #endif |