2007-10-18 17:42:28

by Christian Borntraeger

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

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 <[email protected]>

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

2007-10-18 19:14:42

by Laurent Vivier

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

Acked-by: Laurent Vivier <[email protected]>

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 <[email protected]>
>
> ---
> 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);
>


--
---------------- [email protected] -----------------
"Given enough eyeballs, all bugs are shallow" E. S. Raymond