powerpc: Fix cpufreq drivers after cpufreq core changes

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>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/powerpc/platforms/cell/cbe_cpufreq.c b/arch/powerpc/platforms/cell/cbe_cpufreq.c
index ec7c8f45a21556c9a7a7bb0ec96331b64f4bb52d..e6506cd0ff94e908c2d2522b8e32e2d14b684ff9 100644 (file)
--- 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 a3c6c01bd6db2cc139c4c753cd641e336f4ccf5f..968c1c0b4d5bc9499ce80ed5bbd8bf6824341efc 100644 (file)
--- 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 86db47c1b6656571f9c9ce3af315fc88eb727085..be2527a516eabcd5cc6c8db97d22c613abfdcc9a 100644 (file)
--- 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 4dfb4bc242b5cc2c360530085a36681506a41d10..beb38333b6d2b9fc22e3acd9559cb4112eb5cb2b 100644 (file)
--- 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,