Commit ec262681 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 0a4908e1 f9e26291

fs/proc/array.c

+1 −1
Original line number Diff line number Diff line
@@ -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);