Fix guest time accounting going faster than user time accounting

Fix guest time accounting going faster than user time accounting

[Christian Borntraeger]

Seems I overlooked this type while reviewing Laurents patch.
cputime_add already adds, dont do it twice.

Avi. This should go to Linus before 2.6.24.

Signed-off-by: Christian Borntraeger <borntraeger-tA70FqPdS9bQT0dZR+AlfA@public.gmane.org>

---
 fs/proc/array.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6.23/fs/proc/array.c
===================================================================
--- linux-2.6.23.orig/fs/proc/array.c
+++ linux-2.6.23/fs/proc/array.c
@@ -446,7 +446,7 @@ static int do_task_stat(struct task_stru
 			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);

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/

Re: Fix guest time accounting going faster than user time accounting

[Laurent Vivier]

Acked-by: Laurent Vivier <Laurent.Vivier-6ktuUTfB/bM@public.gmane.org>

Christian Borntraeger a écrit :
> Seems I overlooked this type while reviewing Laurents patch.
> cputime_add already adds, dont do it twice.
> 
> Avi. This should go to Linus before 2.6.24.
> 
> Signed-off-by: Christian Borntraeger <borntraeger-tA70FqPdS9bQT0dZR+AlfA@public.gmane.org>
> 
> ---
>  fs/proc/array.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> Index: linux-2.6.23/fs/proc/array.c
> ===================================================================
> --- linux-2.6.23.orig/fs/proc/array.c
> +++ linux-2.6.23/fs/proc/array.c
> @@ -446,7 +446,7 @@ static int do_task_stat(struct task_stru
>  			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);
> 


-- 
---------------- Laurent.Vivier-6ktuUTfB/bM@public.gmane.org  -----------------
"Given enough eyeballs, all bugs are shallow" E. S. Raymond


-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/