| Message ID | 1231719721.22571.9.camel@pasglop (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Commit | ae04d1401577bb63151480a053057de58b8e10bb |
| Headers | show |
* Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote: > This updates the cpufreq drivers in arch/powerpc so they build again > after the core cpufreq changes that broke them in commit > in835481d9bcd65720b473db6b38746a74a3964218. > > Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> > --- > > Tested on a G5. Olof, Arnd, any chance you can test the cell and pasemi > drivers still work ? > > Linus, you can probably merge this now to fix the build problems. Thanks Ben! The powerpc defconfig built fine - you might wan to turn on cpufreq in the powerpc defconfig so that cross-build tests can catch problems like this. Ingo
On Mon, Jan 12, 2009 at 11:22:01AM +1100, Benjamin Herrenschmidt wrote: > This updates the cpufreq drivers in arch/powerpc so they build again > after the core cpufreq changes that broke them in commit > in835481d9bcd65720b473db6b38746a74a3964218. > > Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> > --- > > Tested on a G5. Olof, Arnd, any chance you can test the cell and pasemi > drivers still work ? Tested fine on pasemi. -Olof
On Mon, 2009-01-12 at 09:34 +0100, Ingo Molnar wrote: > * Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote: > > > This updates the cpufreq drivers in arch/powerpc so they build again > > after the core cpufreq changes that broke them in commit > > in835481d9bcd65720b473db6b38746a74a3964218. > > > > Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> > > --- > > > > Tested on a G5. Olof, Arnd, any chance you can test the cell and pasemi > > drivers still work ? > > > > Linus, you can probably merge this now to fix the build problems. > > Thanks Ben! > > The powerpc defconfig built fine - you might wan to turn on cpufreq in the > powerpc defconfig so that cross-build tests can catch problems like this. Hrm... which config are you using ? ppc64_defconfig has them all on. Cheers, Ben.
diff --git a/arch/powerpc/platforms/cell/cbe_cpufreq.c b/arch/powerpc/platforms/cell/cbe_cpufreq.c index ec7c8f4..e6506cd 100644 --- a/arch/powerpc/platforms/cell/cbe_cpufreq.c +++ b/arch/powerpc/platforms/cell/cbe_cpufreq.c @@ -118,7 +118,7 @@ static int cbe_cpufreq_cpu_init(struct cpufreq_policy *policy) policy->cur = cbe_freqs[cur_pmode].frequency; #ifdef CONFIG_SMP - policy->cpus = per_cpu(cpu_sibling_map, policy->cpu); + cpumask_copy(policy->cpus, &per_cpu(cpu_sibling_map, policy->cpu)); #endif cpufreq_frequency_table_get_attr(cbe_freqs, policy->cpu); diff --git a/arch/powerpc/platforms/cell/cpufreq_spudemand.c b/arch/powerpc/platforms/cell/cpufreq_spudemand.c index a3c6c01..968c1c0 100644 --- a/arch/powerpc/platforms/cell/cpufreq_spudemand.c +++ b/arch/powerpc/platforms/cell/cpufreq_spudemand.c @@ -110,7 +110,7 @@ static int spu_gov_govern(struct cpufreq_policy *policy, unsigned int event) } /* initialize spu_gov_info for all affected cpus */ - for_each_cpu_mask(i, policy->cpus) { + for_each_cpu(i, policy->cpus) { affected_info = &per_cpu(spu_gov_info, i); affected_info->policy = policy; } @@ -127,7 +127,7 @@ static int spu_gov_govern(struct cpufreq_policy *policy, unsigned int event) spu_gov_cancel_work(info); /* clean spu_gov_info for all affected cpus */ - for_each_cpu_mask (i, policy->cpus) { + for_each_cpu (i, policy->cpus) { info = &per_cpu(spu_gov_info, i); info->policy = NULL; } diff --git a/arch/powerpc/platforms/pasemi/cpufreq.c b/arch/powerpc/platforms/pasemi/cpufreq.c index 86db47c..be2527a 100644 --- a/arch/powerpc/platforms/pasemi/cpufreq.c +++ b/arch/powerpc/platforms/pasemi/cpufreq.c @@ -213,7 +213,7 @@ static int pas_cpufreq_cpu_init(struct cpufreq_policy *policy) pr_debug("current astate is at %d\n",cur_astate); policy->cur = pas_freqs[cur_astate].frequency; - policy->cpus = cpu_online_map; + cpumask_copy(policy->cpus, &cpu_online_map); ppc_proc_freq = policy->cur * 1000ul; diff --git a/arch/powerpc/platforms/powermac/cpufreq_64.c b/arch/powerpc/platforms/powermac/cpufreq_64.c index 4dfb4bc..beb3833 100644 --- a/arch/powerpc/platforms/powermac/cpufreq_64.c +++ b/arch/powerpc/platforms/powermac/cpufreq_64.c @@ -362,7 +362,7 @@ static int g5_cpufreq_cpu_init(struct cpufreq_policy *policy) /* secondary CPUs are tied to the primary one by the * cpufreq core if in the secondary policy we tell it that * it actually must be one policy together with all others. */ - policy->cpus = cpu_online_map; + cpumask_copy(policy->cpus, &cpu_online_map); cpufreq_frequency_table_get_attr(g5_cpu_freqs, policy->cpu); return cpufreq_frequency_table_cpuinfo(policy,
This updates the cpufreq drivers in arch/powerpc so they build again after the core cpufreq changes that broke them in commit in835481d9bcd65720b473db6b38746a74a3964218. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> --- Tested on a G5. Olof, Arnd, any chance you can test the cell and pasemi drivers still work ? Linus, you can probably merge this now to fix the build problems.