Re: [PATCH] procfs: do not confuse jiffies with cputime64_t

[Michal Hocko]

On Mon 12-12-11 01:11:04, Andreas Schwab wrote:
> get_{idle,iowait}_time are supposed to return cputime64_t values, not jiffies.
> 
> Signed-off-by: Andreas Schwab <schwab@xxxxxxxxxxxxxx>

Ahhh, I have missed that jiffies64_to_cputime64 is doing something for
ia64 and powerpc.
Thanks for noticing and fixing that up.

Acked-by: Michal Hocko <mhocko@xxxxxxx>

> ---
>  fs/proc/stat.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/proc/stat.c b/fs/proc/stat.c
> index 2a30d67..88f8a55 100644
> --- a/fs/proc/stat.c
> +++ b/fs/proc/stat.c
> @@ -32,7 +32,7 @@ static cputime64_t get_idle_time(int cpu)
>  		idle = kstat_cpu(cpu).cpustat.idle;
>  		idle = cputime64_add(idle, arch_idle_time(cpu));
>  	} else
> -		idle = nsecs_to_jiffies64(1000 * idle_time);
> +		idle = jiffies64_to_cputime64(nsecs_to_jiffies64(1000 * idle_time));
>  
>  	return idle;
>  }
> @@ -46,7 +46,7 @@ static cputime64_t get_iowait_time(int cpu)
>  		/* !NO_HZ so we can rely on cpustat.iowait */
>  		iowait = kstat_cpu(cpu).cpustat.iowait;
>  	else
> -		iowait = nsecs_to_jiffies64(1000 * iowait_time);
> +		iowait = jiffies64_to_cputime64(nsecs_to_jiffies64(1000 * iowait_time));
>  
>  	return iowait;
>  }
> -- 
> 1.7.8
> 
> 
> -- 
> Andreas Schwab, schwab@xxxxxxxxxxxxxx
> GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
> "And now for something completely different."

-- 
Michal Hocko
SUSE Labs
SUSE LINUX s.r.o.
Lihovarska 1060/12
190 00 Praha 9    
Czech Republic
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/