Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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
Linus Torvalds 17 years ago
parent
0a4908e19f f9e26291be
commit
ec2626815b
1 changed files with 1 additions and 1 deletions
Unified View Show Diff Stats
  1. 1 1
      fs/proc/array.c

+ 1 - 1
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);