lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "cpuidle: build fix for non-x86"

Browse Source 
This reverts commit f757397097.
which ironically broke the ia64 build
This commit is contained in:
Len Brown
2008-02-07 04:16:34 -05:00
parent 81e242d0ef
commit 9b71315421
3 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/x86/Kconfig
View File

@@ -98,9 +98,6 @@ config ARCH_HAS_ILOG2_U32
config ARCH_HAS_ILOG2_U64 config ARCH_HAS_ILOG2_U64
def_bool n def_bool n
config ARCH_HAS_CPU_IDLE_WAIT
def_bool y
config GENERIC_CALIBRATE_DELAY config GENERIC_CALIBRATE_DELAY
def_bool y def_bool y

2
drivers/cpuidle/cpuidle.c
View File

@@ -83,7 +83,7 @@ void cpuidle_uninstall_idle_handler(void)
{ {
if (enabled_devices && (pm_idle != pm_idle_old)) { if (enabled_devices && (pm_idle != pm_idle_old)) {
pm_idle = pm_idle_old; pm_idle = pm_idle_old;
cpuidle_kick_cpus(); cpu_idle_wait();
} }
} }

13
include/linux/cpuidle.h
View File

@@ -73,19 +73,6 @@ cpuidle_set_statedata(struct cpuidle_state *state, void *data)
state->driver_data = 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_kobj {
struct cpuidle_state *state; struct cpuidle_state *state;
struct completion kobj_unregister; struct completion kobj_unregister;