X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2Fproc%2Farray.c;h=d80baaabf835e1c98911004035518bf5df7dc51d;hb=db8185360d91c01f6e482db5ee402c0ad90dec52;hp=63c95afb561f8e8742118197b0731317ea871463;hpb=60812a4a99b796d894d2522dc63cb0fafc3be25e;p=linux-2.6

diff --git a/fs/proc/array.c b/fs/proc/array.c
index 63c95afb56..d80baaabf8 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -358,7 +358,8 @@ static cputime_t task_utime(struct task_struct *p)
 	}
 	utime = (clock_t)temp;
 
-	return clock_t_to_cputime(utime);
+	p->prev_utime = max(p->prev_utime, clock_t_to_cputime(utime));
+	return p->prev_utime;
 }
 
 static cputime_t task_stime(struct task_struct *p)