Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=f9e26291be31cb494c1845e356daba84b39ab059
Commit: f9e26291be31cb494c1845e356daba84b39ab059
Parent: 4fa4d23fa20de67df919030c1216295664866ad7
Author: Christian Borntraeger <[EMAIL PROTECTED]>
AuthorDate: Fri Oct 19 20:52:40 2007 +0200
Committer: Ingo Molnar <[EMAIL PROTECTED]>
CommitDate: Fri Oct 19 20:52:40 2007 +0200
sched: fix guest time accounting going faster than user time accounting
cputime_add already adds, dont do it twice.
Signed-off-by: Christian Borntraeger <[EMAIL PROTECTED]>
Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
---
fs/proc/array.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fs/proc/array.c b/fs/proc/array.c
index 27b59f5..b9be6e3 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);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
