commit ec2626815bf9a9922e49820b03e670e833f3ca3c
author Linus Torvalds <torvalds@woody.linux-foundation.org> Fri Oct 19 12:07:03 2007 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Fri Oct 19 12:07:03 2007 -0700
tree c1d6ff9559a62c5636adaae7a6c7cac397762f42
parent 0a4908e19fd016d60403fc76cf38b2d08d21e2d2
parent f9e26291be31cb494c1845e356daba84b39ab059

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

* 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

fs/proc/array.c

diff --git a/fs/proc/array.c b/fs/proc/array.c
index 7a34571..63c95af 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -456,7 +456,7 @@
 			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);