From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 19 Oct 2007 19:07:03 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched
X-Git-Tag: v2.6.24-rc1~136
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=ec2626815bf9a9922e49820b03e670e833f3ca3c;p=linux-2.6-omap-h63xx.git

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
---

ec2626815bf9a9922e49820b03e670e833f3ca3c
diff --cc fs/proc/array.c
index 7a34571203b,b9be6e355cc..63c95afb561
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@@ -456,12 -446,12 +456,12 @@@ static int do_task_stat(struct task_str
  			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);
 -		pgid = process_group(task);
 -		ppid = rcu_dereference(task->real_parent)->tgid;
 +		sid = task_session_nr_ns(task, ns);
 +		pgid = task_pgrp_nr_ns(task, ns);
 +		ppid = task_ppid_nr_ns(task, ns);
  
  		unlock_task_sighand(task, &flags);
  	}