Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-29 06:12:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched

Browse Source 
* 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:
Linus Torvalds 2007-10-19 12:07:03 -07:00
commit ec2626815b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/proc/array.c
View File

@ -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);