aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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
123config ARCH_HAS_CPU_RELAX 123config ARCH_HAS_CPU_RELAX
124 def_bool y 124 def_bool y
125 125
126config ARCH_HAS_DEFAULT_IDLE
127 def_bool y
128
126config ARCH_HAS_CACHE_LINE_SIZE 129config ARCH_HAS_CACHE_LINE_SIZE
127 def_bool y 130 def_bool y
128 131
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)
56 if (pm_idle_old) 56 if (pm_idle_old)
57 pm_idle_old(); 57 pm_idle_old();
58 else 58 else
59#if defined(CONFIG_ARCH_HAS_DEFAULT_IDLE)
60 default_idle();
61#else
59 local_irq_enable(); 62 local_irq_enable();
63#endif
60 return; 64 return;
61 } 65 }
62 66