From 03c971c08dfe801a1406db7c4145d3bbdb4e298d Mon Sep 17 00:00:00 2001
From: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Date: Thu, 16 Oct 2008 19:00:08 -0400
Subject: [PATCH] --- yaml --- r: 117336 b: refs/heads/master c:
 89cedfefca1d446ee2598fd3bcbb23ee3802e26a h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/arch/x86/Kconfig          | 3 +++
 trunk/drivers/cpuidle/cpuidle.c | 4 ++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 09ff88d62356..37c22b4799e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: addbad46ed0906cd584784423b9d0babc7476446
+refs/heads/master: 89cedfefca1d446ee2598fd3bcbb23ee3802e26a
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
index ed92864d1325..f8caf040650e 100644
--- a/trunk/arch/x86/Kconfig
+++ b/trunk/arch/x86/Kconfig
@@ -123,6 +123,9 @@ config GENERIC_TIME_VSYSCALL
 config ARCH_HAS_CPU_RELAX
 	def_bool y
 
+config ARCH_HAS_DEFAULT_IDLE
+	def_bool y
+
 config ARCH_HAS_CACHE_LINE_SIZE
 	def_bool y
 
diff --git a/trunk/drivers/cpuidle/cpuidle.c b/trunk/drivers/cpuidle/cpuidle.c
index eb2cade562db..bb6e3b338043 100644
--- a/trunk/drivers/cpuidle/cpuidle.c
+++ b/trunk/drivers/cpuidle/cpuidle.c
@@ -56,7 +56,11 @@ static void cpuidle_idle_call(void)
 		if (pm_idle_old)
 			pm_idle_old();
 		else
+#if defined(CONFIG_ARCH_HAS_DEFAULT_IDLE)
+			default_idle();
+#else
 			local_irq_enable();
+#endif
 		return;
 	}