diff options
| -rw-r--r-- | arch/x86/Kconfig | 3 | ||||
| -rw-r--r-- | drivers/cpuidle/cpuidle.c | 2 | ||||
| -rw-r--r-- | include/linux/cpuidle.h | 13 |
3 files changed, 1 insertions, 17 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 3954ae96b0c..fd426500705 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -98,9 +98,6 @@ 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/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c index d868d737742..2c4b2d47973 100644 --- a/drivers/cpuidle/cpuidle.c +++ b/drivers/cpuidle/cpuidle.c @@ -83,7 +83,7 @@ void cpuidle_uninstall_idle_handler(void) { if (enabled_devices && (pm_idle != pm_idle_old)) { pm_idle = pm_idle_old; - cpuidle_kick_cpus(); + cpu_idle_wait(); } } diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h index c8eb8c71809..385d45b616d 100644 --- a/include/linux/cpuidle.h +++ b/include/linux/cpuidle.h @@ -73,19 +73,6 @@ 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; |