diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 21:07:03 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 21:07:03 +0200 |
| commit | ec2626815bf9a9922e49820b03e670e833f3ca3c (patch) | |
| tree | c1d6ff9559a62c5636adaae7a6c7cac397762f42 /fs/proc/array.c | |
| parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff) | |
| parent | sched: fix guest time accounting going faster than user time accounting (diff) | |
| download | linux-ec2626815bf9a9922e49820b03e670e833f3ca3c.tar.xz 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
Diffstat (limited to 'fs/proc/array.c')
| -rw-r--r-- | 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 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); |