X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2Fproc%2Farray.c;h=eba339ecba27b58e3a39d58d54062d1bdbe3a48f;hb=e58b7dab272ecee09cd7bafb89d6b224cd17bbe3;hp=d80baaabf835e1c98911004035518bf5df7dc51d;hpb=73a2bcb0edb9ffb0b007b3546b430e2c6e415eee;p=linux-2.6 diff --git a/fs/proc/array.c b/fs/proc/array.c index d80baaabf8..eba339ecba 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