summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVenkatesh Pallipadi <venkatesh.pallipadi@intel.com>2008-10-16 19:00:08 -0400
committerLen Brown <len.brown@intel.com>2008-10-16 19:00:08 -0400
commit89cedfefca1d446ee2598fd3bcbb23ee3802e26a (patch)
tree8b64a39b4bc1fda76dfdecdb9c97d05a017c99c2
parentaddbad46ed0906cd584784423b9d0babc7476446 (diff)
downloadkernel-common-89cedfefca1d446ee2598fd3bcbb23ee3802e26a.tar.gz
kernel-common-89cedfefca1d446ee2598fd3bcbb23ee3802e26a.tar.bz2
kernel-common-89cedfefca1d446ee2598fd3bcbb23ee3802e26a.zip
cpuidle: upon BIOS bug, default to default_idle rather than polling
http://bugzilla.kernel.org/show_bug.cgi?id=11345 Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r--arch/x86/Kconfig3
-rw-r--r--drivers/cpuidle/cpuidle.c4
2 files changed, 7 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index ed92864d1325..f8caf040650e 100644
--- a/arch/x86/Kconfig
+++ b/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/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index eb2cade562db..bb6e3b338043 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/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;
}