Merge tag 'mac80211-for-davem-2015-05-19' of git://git.kernel.org/pub/scm/linux/kerne...

[cascardo/linux.git] / drivers / cpuidle / coupled.c

diff --git a/drivers/cpuidle/coupled.c b/drivers/cpuidle/coupled.c
index 73fe2f8..7936dce 100644 (file)
--- a/drivers/cpuidle/coupled.c
+++ b/drivers/cpuidle/coupled.c
@@ -292,7 +292,7 @@ static inline int cpuidle_coupled_get_state(struct cpuidle_device *dev,
         */
        smp_rmb();
 
-       for_each_cpu_mask(i, coupled->coupled_cpus)
+       for_each_cpu(i, &coupled->coupled_cpus)
                if (cpu_online(i) && coupled->requested_state[i] < state)
                        state = coupled->requested_state[i];
 
@@ -338,7 +338,7 @@ static void cpuidle_coupled_poke_others(int this_cpu,
 {
        int cpu;
 
-       for_each_cpu_mask(cpu, coupled->coupled_cpus)
+       for_each_cpu(cpu, &coupled->coupled_cpus)
                if (cpu != this_cpu && cpu_online(cpu))
                        cpuidle_coupled_poke(cpu);
 }
@@ -638,7 +638,7 @@ int cpuidle_coupled_register_device(struct cpuidle_device *dev)
        if (cpumask_empty(&dev->coupled_cpus))
                return 0;
 
-       for_each_cpu_mask(cpu, dev->coupled_cpus) {
+       for_each_cpu(cpu, &dev->coupled_cpus) {
                other_dev = per_cpu(cpuidle_devices, cpu);
                if (other_dev && other_dev->coupled) {
                        coupled = other_dev->coupled;