[ Updated with suggestions from Rafael ]
Convert cpu_idle_wait() to cpuidle_kick_cpus() macro which is
SMP-only, and gives error on non supported CPU.
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxx>
diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index d2fabe7..794962d 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -82,7 +82,7 @@ void cpuidle_uninstall_idle_handler(void)
{
if (enabled_devices && (pm_idle != pm_idle_old)) {
pm_idle = pm_idle_old;
- cpu_idle_wait();
+ cpuidle_kick_cpus();
}
}
diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
index c4e0016..12466ec 100644
--- a/include/linux/cpuidle.h
+++ b/include/linux/cpuidle.h
@@ -72,6 +72,17 @@ cpuidle_set_statedata(struct cpuidle_state *state, void *data)
state->driver_data = data;
}
+#if !defined(CONFIG_SMP)
+static inline void cpuidle_kick_cpus(void) {}
+#elif defined(CONFIG_X86)
+static inline void cpuidle_kick_cpus(void)
+{
+ cpu_idle_wait()
+}
+#else
+#error "Arch needs cpu_idle_wait() equivalent here"
+#endif
+
struct cpuidle_state_kobj {
struct cpuidle_state *state;
struct completion kobj_unregister;
-
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
