On Monday 22 of October 2012 15:35:29 Andreas Schwab wrote: > The function get_cpu_idle_time_jiffy in both the conservative and > ondemand governors use jiffies_to_usecs to convert a cputime value to > usecs which gives the wrong value on architectures where cputime and > jiffies use different units. Only matters if NO_HZ is disabled, since > otherwise get_cpu_idle_time_us should already return a valid value, and > get_cpu_idle_time_jiffy isn't actually called. > > Signed-off-by: Andreas Schwab <schwab@xxxxxxxxxxxxxx> I have rebased your patch on top of some other changes in linux-pm.git/linux-next. Please have a look at http://git.kernel.org/?p=linux/kernel/git/rafael/linux-pm.git;a=shortlog;h=refs/heads/linux-next and let me know if that's what you meant. Thanks, Rafael > --- > drivers/cpufreq/cpufreq_conservative.c | 4 ++-- > drivers/cpufreq/cpufreq_ondemand.c | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c > index a152af7..96af7d5 100644 > --- a/drivers/cpufreq/cpufreq_conservative.c > +++ b/drivers/cpufreq/cpufreq_conservative.c > @@ -112,9 +112,9 @@ static inline u64 get_cpu_idle_time_jiffy(unsigned int cpu, u64 *wall) > > idle_time = cur_wall_time - busy_time; > if (wall) > - *wall = jiffies_to_usecs(cur_wall_time); > + *wall = cputime_to_usecs(cur_wall_time); > > - return jiffies_to_usecs(idle_time); > + return cputime_to_usecs(idle_time); > } > > static inline cputime64_t get_cpu_idle_time(unsigned int cpu, cputime64_t *wall) > diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c > index 396322f..6c19a66 100644 > --- a/drivers/cpufreq/cpufreq_ondemand.c > +++ b/drivers/cpufreq/cpufreq_ondemand.c > @@ -136,9 +136,9 @@ static inline u64 get_cpu_idle_time_jiffy(unsigned int cpu, u64 *wall) > > idle_time = cur_wall_time - busy_time; > if (wall) > - *wall = jiffies_to_usecs(cur_wall_time); > + *wall = cputime_to_usecs(cur_wall_time); > > - return jiffies_to_usecs(idle_time); > + return cputime_to_usecs(idle_time); > } > > static inline cputime64_t get_cpu_idle_time(unsigned int cpu, cputime64_t *wall) > -- I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center. -- To unsubscribe from this list: send the line "unsubscribe cpufreq" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
