From 47f1488f90c2b4221ea31642f87d2d783d17c1cd Mon Sep 17 00:00:00 2001
From: Kevin Hilman <khilman@mvista.com>
Date: Thu, 31 Jan 2008 17:28:18 -0800
Subject: [PATCH] --- yaml --- r: 84113 b: refs/heads/master c:
 f757397097d0713c949af76dccabb65a2785782e h: refs/heads/master i:   84111:
 f005f47fffcff7aab63f376d6c8fbcb7a9ab96ee v: v3

---
 [refs]                          |  2 +-
 trunk/arch/x86/Kconfig          |  3 +++
 trunk/drivers/cpuidle/cpuidle.c |  2 +-
 trunk/include/linux/cpuidle.h   | 13 +++++++++++++
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 71ec91bfeafc..190af275feab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 25de5718356e264820625600a9edca1df5ff26f8
+refs/heads/master: f757397097d0713c949af76dccabb65a2785782e
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
index 368864dfe6eb..37d1297e6787 100644
--- a/trunk/arch/x86/Kconfig
+++ b/trunk/arch/x86/Kconfig
@@ -105,6 +105,9 @@ config ARCH_HAS_ILOG2_U32
 config ARCH_HAS_ILOG2_U64
 	def_bool n
 
+config ARCH_HAS_CPU_IDLE_WAIT
+	def_bool y
+
 config GENERIC_CALIBRATE_DELAY
 	def_bool y
 
diff --git a/trunk/drivers/cpuidle/cpuidle.c b/trunk/drivers/cpuidle/cpuidle.c
index d2fabe7863a9..794962d9f48b 100644
--- a/trunk/drivers/cpuidle/cpuidle.c
+++ b/trunk/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/trunk/include/linux/cpuidle.h b/trunk/include/linux/cpuidle.h
index 16a51546db44..cb95f5a9075a 100644
--- a/trunk/include/linux/cpuidle.h
+++ b/trunk/include/linux/cpuidle.h
@@ -72,6 +72,19 @@ cpuidle_set_statedata(struct cpuidle_state *state, void *data)
 	state->driver_data = data;
 }
 
+#ifdef CONFIG_SMP
+#ifdef CONFIG_ARCH_HAS_CPU_IDLE_WAIT
+static inline void cpuidle_kick_cpus(void)
+{
+	cpu_idle_wait();
+}
+#else /* !CONFIG_ARCH_HAS_CPU_IDLE_WAIT */
+#error "Arch needs cpu_idle_wait() equivalent here"
+#endif /* !CONFIG_ARCH_HAS_CPU_IDLE_WAIT */
+#else /* !CONFIG_SMP */
+static inline void cpuidle_kick_cpus(void) {}
+#endif /* !CONFIG_SMP */
+
 struct cpuidle_state_kobj {
 	struct cpuidle_state *state;
 	struct completion kobj_unregister;