summaryrefslogtreecommitdiffstats
path: root/fs/proc
diff options
context:
space:
mode:
authorBalbir Singh <balbir@linux.vnet.ibm.com>2007-10-30 00:26:32 +0100
committerIngo Molnar <mingo@elte.hu>2007-10-30 00:26:32 +0100
commit9301899be75b464ef097f0b5af7af6d9bd8f68a7 (patch)
treea7053c5c0babcdbad6d4baff0551d60e5c4308af /fs/proc
parent82798a17ad40df827d465329a20ace80497f9b32 (diff)
downloadop-kernel-dev-9301899be75b464ef097f0b5af7af6d9bd8f68a7.zip
op-kernel-dev-9301899be75b464ef097f0b5af7af6d9bd8f68a7.tar.gz
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 'fs/proc')
-rw-r--r--fs/proc/array.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/proc/array.c b/fs/proc/array.c
index d80baaa..eba339e 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
OpenPOWER on IntegriCloud