Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7573970 authored by Kevin Hilman's avatar Kevin Hilman Committed by Len Brown
Browse files

cpuidle: build fix for non-x86 



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

Signed-off-by: default avatarKevin Hilman <khilman@mvista.com>
Acked-by: default avatarVenkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Acked-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 25de5718

arch/x86/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -105,6 +105,9 @@ 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

drivers/cpuidle/cpuidle.c

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ void cpuidle_uninstall_idle_handler(void) 
{

	if (enabled_devices && (pm_idle != pm_idle_old)) {

		pm_idle = pm_idle_old;

		cpu_idle_wait();

		cpuidle_kick_cpus();

	}

}

include/linux/cpuidle.h

+13 −0
Original line number Diff line number Diff line
@@ -72,6 +72,19 @@ 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;