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

Commit 9b713154 authored by Len Brown's avatar Len Brown
Browse files

Revert "cpuidle: build fix for non-x86" 

This reverts commit f7573970.
which ironically broke the ia64 build
parent 81e242d0

arch/x86/Kconfig

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

drivers/cpuidle/cpuidle.c

+1 −1
Original line number Diff line number Diff line
@@ -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();

	}

}

include/linux/cpuidle.h

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