summaryrefslogtreecommitdiffstats
path: root/fs/proc
diff options
context:
space:
mode:
authorChristian Borntraeger <borntraeger@de.ibm.com>2007-10-19 20:52:40 +0200
committerIngo Molnar <mingo@elte.hu>2007-10-19 20:52:40 +0200
commitf9e26291be31cb494c1845e356daba84b39ab059 (patch)
tree8c64fdbdb0c01aa2b73e41c5aefc06b80254dac2 /fs/proc
parent4fa4d23fa20de67df919030c1216295664866ad7 (diff)
downloadlinux-f9e26291be31cb494c1845e356daba84b39ab059.tar.gz
linux-f9e26291be31cb494c1845e356daba84b39ab059.tar.bz2
linux-f9e26291be31cb494c1845e356daba84b39ab059.zip
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>
Diffstat (limited to 'fs/proc')
-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 27b59f5f3bd1..b9be6e355cc6 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);