Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched
Linus Torvalds [Fri, 19 Oct 2007 19:07:03 +0000 (12:07 -0700)]
* 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

1  2 
fs/proc/array.c

diff --cc 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);
        }