From f9e26291be31cb494c1845e356daba84b39ab059 Mon Sep 17 00:00:00 2001 From: Christian Borntraeger <borntraeger@de.ibm.com> Date: Fri, 19 Oct 2007 20:52:40 +0200 Subject: sched: fix guest time accounting going faster than user time accounting cputime_add already adds, dont do it twice. Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> --- fs/proc/array.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'fs') diff --git a/fs/proc/array.c b/fs/proc/array.c index 27b59f5f3b..b9be6e355c 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c @@ -446,7 +446,7 @@ static int do_task_stat(struct task_struct *task, char *buffer, int whole) maj_flt += sig->maj_flt; utime = cputime_add(utime, sig->utime); stime = cputime_add(stime, sig->stime); - gtime += cputime_add(gtime, sig->gtime); + gtime = cputime_add(gtime, sig->gtime); } sid = signal_session(sig); -- cgit v1.2.2