Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-s…

…ched * git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched: sched: fix guest time accounting going faster than user time accounting
git-mirror · Oct 19, 2007 · ec26268 · ec26268
2 parents 0a4908e + f9e2629
commit ec26268
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/fs/proc/array.c b/fs/proc/array.c
@@ -456,7 +456,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 = task_session_nr_ns(task, ns);