Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cpuidle: build fix for non-x86

Browse source 
Convert cpu_idle_wait() to cpuidle_kick_cpus() macro which is
SMP-only, and gives error on non supported CPU.

Signed-off-by: Kevin Hilman <khilman@mvista.com>
Acked-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Kevin Hilman 2008-01-31 17:28:18 -08:00 committed by Len Brown
parent 25de571835
commit f757397097
3 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
arch/x86/Kconfig
View file

@ -105,6 +105,9 @@ 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

@ -82,7 +82,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;
cpu_idle_wait(); cpuidle_kick_cpus();
} }
} }

13
include/linux/cpuidle.h
View file

@ -72,6 +72,19 @@ 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;