On Wednesday 24 of October 2012 13:15:58 Viresh Kumar wrote: > There were few sparse warnings due to mismatch of type on function arguments. > Two types were used u64 and cputime64_t. Both are actually u64, so use u64 only. > > Reported-by: Fengguang Wu <fengguang.wu@xxxxxxxxx> > Signed-off-by: Viresh Kumar <viresh.kumar@xxxxxxxxxx> This series appears to be based on your "cpufreq: governors: remove redundant code" patch that hasn't been applied yet. Please rebase it on top of linux-pm/linux-next or on top of v3.7-rc2, whichever is more convenient, and resend. Thanks, Rafael > --- > > This solution was discussed here: > > http://www.mail-archive.com/linaro-dev@xxxxxxxxxxxxxxxx/msg13744.html > > drivers/cpufreq/cpufreq_governor.c | 4 ++-- > drivers/cpufreq/cpufreq_governor.h | 11 +++++------ > drivers/cpufreq/cpufreq_stats.c | 4 ++-- > 3 files changed, 9 insertions(+), 10 deletions(-) > > diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c > index cd5fe57..e39bf81 100644 > --- a/drivers/cpufreq/cpufreq_governor.c > +++ b/drivers/cpufreq/cpufreq_governor.c > @@ -49,7 +49,7 @@ static inline u64 get_cpu_idle_time_jiffy(unsigned int cpu, u64 *wall) > return jiffies_to_usecs(idle_time); > } > > -cputime64_t get_cpu_idle_time(unsigned int cpu, cputime64_t *wall) > +u64 get_cpu_idle_time(unsigned int cpu, u64 *wall) > { > u64 idle_time = get_cpu_idle_time_us(cpu, NULL); > > @@ -81,7 +81,7 @@ void dbs_check_cpu(struct dbs_data *dbs_data, int cpu) > /* Get Absolute Load (in terms of freq for ondemand gov) */ > for_each_cpu(j, policy->cpus) { > struct cpu_dbs_common_info *j_cdbs; > - cputime64_t cur_wall_time, cur_idle_time, cur_iowait_time; > + u64 cur_wall_time, cur_idle_time, cur_iowait_time; > unsigned int idle_time, wall_time, iowait_time; > unsigned int load; > > diff --git a/drivers/cpufreq/cpufreq_governor.h b/drivers/cpufreq/cpufreq_governor.h > index 34e14ad..f661654 100644 > --- a/drivers/cpufreq/cpufreq_governor.h > +++ b/drivers/cpufreq/cpufreq_governor.h > @@ -17,7 +17,6 @@ > #ifndef _CPUFREQ_GOVERNER_H > #define _CPUFREQ_GOVERNER_H > > -#include <asm/cputime.h> > #include <linux/cpufreq.h> > #include <linux/kobject.h> > #include <linux/mutex.h> > @@ -72,9 +71,9 @@ static void *get_cpu_dbs_info_s(int cpu) \ > /* Per cpu structures */ > struct cpu_dbs_common_info { > int cpu; > - cputime64_t prev_cpu_idle; > - cputime64_t prev_cpu_wall; > - cputime64_t prev_cpu_nice; > + u64 prev_cpu_idle; > + u64 prev_cpu_wall; > + u64 prev_cpu_nice; > struct cpufreq_policy *cur_policy; > struct delayed_work work; > /* > @@ -87,7 +86,7 @@ struct cpu_dbs_common_info { > > struct od_cpu_dbs_info_s { > struct cpu_dbs_common_info cdbs; > - cputime64_t prev_cpu_iowait; > + u64 prev_cpu_iowait; > struct cpufreq_frequency_table *freq_table; > unsigned int freq_lo; > unsigned int freq_lo_jiffies; > @@ -170,7 +169,7 @@ static inline int delay_for_sampling_rate(unsigned int sampling_rate) > return delay; > } > > -cputime64_t get_cpu_idle_time(unsigned int cpu, cputime64_t *wall); > +u64 get_cpu_idle_time(unsigned int cpu, u64 *wall); > void dbs_check_cpu(struct dbs_data *dbs_data, int cpu); > int cpufreq_governor_dbs(struct dbs_data *dbs_data, > struct cpufreq_policy *policy, unsigned int event); > diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c > index b40ee14..683a48f 100644 > --- a/drivers/cpufreq/cpufreq_stats.c > +++ b/drivers/cpufreq/cpufreq_stats.c > @@ -37,7 +37,7 @@ struct cpufreq_stats { > unsigned int max_state; > unsigned int state_num; > unsigned int last_index; > - cputime64_t *time_in_state; > + u64 *time_in_state; > unsigned int *freq_table; > #ifdef CONFIG_CPU_FREQ_STAT_DETAILS > unsigned int *trans_table; > @@ -223,7 +223,7 @@ static int cpufreq_stats_create_table(struct cpufreq_policy *policy, > count++; > } > > - alloc_size = count * sizeof(int) + count * sizeof(cputime64_t); > + alloc_size = count * sizeof(int) + count * sizeof(u64); > > #ifdef CONFIG_CPU_FREQ_STAT_DETAILS > alloc_size += count * count * sizeof(int); > -- 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
