cpuidle: stub out cpuidle_poll_state_init() without CONFIG_CPU_IDLE
PATCH 1/1 cpuidle: stub out cpuidle_poll_state_init() without CONFIG_CPU_IDLE
Calling cpuidle_poll_state_init() from apm_init() results in a link failure since that directory is never entered without CONFIG_CPU_IDLE:
arch/x86/kernel/apm_32.o: In function `apm_init':
apm_32.c:(.init.text+0x62c): undefined reference to `cpuidle_poll_state_init'
CONFIG_ARCH_HAS_CPU_RELAX can be set without CONFIG_CPU_IDLE but has no effect then, so we should treat that configuration the same as if CONFIG_ARCH_HAS_CPU_RELAX was not set at all.
--- include/linux/cpuidle.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/cpuidle.h +1 -1
@@ -225,7 +225,7 @@ static inline void cpuidle_coupled_parallel_barrier(struct cpuidle_device *dev, }#endif -#ifdef CONFIG_ARCH_HAS_CPU_RELAX +#if defined(CONFIG_CPU_IDLE ) && defined(CONFIG_ARCH_HAS_CPU_RELAX )void cpuidle_poll_state_init (struct cpuidle_driver *drv);#else static inline void cpuidle_poll_state_init (struct cpuidle_driver *drv) {}
Signature · 1 line
2.9.0
Quoted 22 lines · CET Arnd Bergmann
Calling
cpuidle_poll_state_init()fromapm_init()results in a link failure since that directory is never entered withoutCONFIG_CPU_IDLE:
arch/x86/kernel/apm_32.o: In function `apm_init':
apm_32.c:(.init.text+0x62c): undefined reference to `cpuidle_poll_state_init'
CONFIG_ARCH_HAS_CPU_RELAXcan be set withoutCONFIG_CPU_IDLEbut has no effect then, so we should treat that configuration the same as ifCONFIG_ARCH_HAS_CPU_RELAXwas not set at all.Fixes 34c2f65b718d ("cpuidle: Move polling state initialization code to separate file")Signed-off-by Arnd Bergmann <[email protected]>--- include/linux/cpuidle.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)include/linux/cpuidle.h +0
-0
include/linux/cpuidle.h static inline void cpuidle_coupled_parallel_barrier(struct cpuidle_device *dev, · line 231
Quoted 8 lines
include/linux/cpuidle.h +1
-1@@ -225,7 +225,7 @@ static inline void cpuidle_coupled_parallel_barrier(struct cpuidle_device *dev, }#endif -#ifdef CONFIG_ARCH_HAS_CPU_RELAX +#if defined(CONFIG_CPU_IDLE ) && defined(CONFIG_ARCH_HAS_CPU_RELAX )void cpuidle_poll_state_init (struct cpuidle_driver *drv);#else static inline void cpuidle_poll_state_init (struct cpuidle_driver *drv) {}
is in the Linus' tree already.
Thanks,
Rafael