Merge tag 'omap-for-v3.11/fixes-for-merge-window' of git://git.kernel.org/pub/scm...

[karo-tx-linux.git] / drivers / cpuidle / cpuidle.c

diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index c3a93fece819e71adb5fcae2acd84f885c0f2583..fdc432f18022b331f2102dccf13b539e74fae3ec 100644 (file)
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -466,7 +466,7 @@ void cpuidle_unregister(struct cpuidle_driver *drv)
        int cpu;
        struct cpuidle_device *device;
 
-       for_each_possible_cpu(cpu) {
+       for_each_cpu(cpu, drv->cpumask) {
                device = &per_cpu(cpuidle_dev, cpu);
                cpuidle_unregister_device(device);
        }
@@ -498,7 +498,7 @@ int cpuidle_register(struct cpuidle_driver *drv,
                return ret;
        }
 
-       for_each_possible_cpu(cpu) {
+       for_each_cpu(cpu, drv->cpumask) {
                device = &per_cpu(cpuidle_dev, cpu);
                device->cpu = cpu;