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
This commit is contained in:
commit
ec2626815b
|
@ -456,7 +456,7 @@ static int do_task_stat(struct task_struct *task, char *buffer, int whole)
|
||||||
maj_flt += sig->maj_flt;
|
maj_flt += sig->maj_flt;
|
||||||
utime = cputime_add(utime, sig->utime);
|
utime = cputime_add(utime, sig->utime);
|
||||||
stime = cputime_add(stime, sig->stime);
|
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);
|
sid = task_session_nr_ns(task, ns);
|
||||||
|
|
Loading…
Reference in New Issue