summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-19 12:07:03 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-19 12:07:03 -0700
commitec2626815bf9a9922e49820b03e670e833f3ca3c (patch)
treec1d6ff9559a62c5636adaae7a6c7cac397762f42
parent0a4908e19fd016d60403fc76cf38b2d08d21e2d2 (diff)
parentf9e26291be31cb494c1845e356daba84b39ab059 (diff)
downloadlinux-ec2626815bf9a9922e49820b03e670e833f3ca3c.tar.gz
linux-ec2626815bf9a9922e49820b03e670e833f3ca3c.tar.bz2
linux-ec2626815bf9a9922e49820b03e670e833f3ca3c.zip
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
-rw-r--r--fs/proc/array.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/proc/array.c b/fs/proc/array.c
index 7a34571203bc..63c95afb561f 100644
--- 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);