diff --git a/[refs] b/[refs] index 0025b63743cf..bc3045cd275f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5e8869bb699d50be5c0733edfc71cfcd5b43e10a +refs/heads/master: 08e4570a4a393bcc241f78dfc444cb0b07995fc0 diff --git a/trunk/fs/proc/array.c b/trunk/fs/proc/array.c index eba339ecba27..65c62e1bfd6f 100644 --- a/trunk/fs/proc/array.c +++ b/trunk/fs/proc/array.c @@ -374,7 +374,9 @@ 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)); - p->prev_stime = max(p->prev_stime, clock_t_to_cputime(stime)); + if (stime >= 0) + p->prev_stime = max(p->prev_stime, clock_t_to_cputime(stime)); + return p->prev_stime; } #endif