Messages in this thread Patch in this message | | | From | Arnd Bergmann <> | Subject | [PATCH] cpuidle: stub out cpuidle_poll_state_init() without CONFIG_CPU_IDLE | Date | Tue, 20 Feb 2018 16:05:44 +0100 |
| |
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.
Fixes: 34c2f65b718d ("cpuidle: Move polling state initialization code to separate file") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- include/linux/cpuidle.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h index 871f9e21810c..0b3fc229086c 100644 --- a/include/linux/cpuidle.h +++ b/include/linux/cpuidle.h @@ -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) {} -- 2.9.0
| |