mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] cpuidle: stub out cpuidle_poll_state_init() without CONFIG_CPU_IDLE
@ 2018-02-20 15:05 Arnd Bergmann
  2018-02-20 15:18 ` Rafael J. Wysocki
  0 siblings, 1 reply; 2+ messages in thread
From: Arnd Bergmann @ 2018-02-20 15:05 UTC (permalink / raw)
  To: Rafael J. Wysocki, Daniel Lezcano; +Cc: Arnd Bergmann, linux-pm, linux-kernel

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

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] cpuidle: stub out cpuidle_poll_state_init() without CONFIG_CPU_IDLE
  2018-02-20 15:05 [PATCH] cpuidle: stub out cpuidle_poll_state_init() without CONFIG_CPU_IDLE Arnd Bergmann
@ 2018-02-20 15:18 ` Rafael J. Wysocki
  0 siblings, 0 replies; 2+ messages in thread
From: Rafael J. Wysocki @ 2018-02-20 15:18 UTC (permalink / raw)
  To: Arnd Bergmann; +Cc: Daniel Lezcano, linux-pm, linux-kernel

On Tuesday, February 20, 2018 4:05:44 PM CET Arnd Bergmann wrote:
> 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) {}
> 

https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git/commit/?h=pm-4.16-rc2&id=d7212cfb05ba802bea4dd6c90d61cfe6366ea224

is in the Linus' tree already.

Thanks,
Rafael

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2018-02-20 15:20 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-02-20 15:05 [PATCH] cpuidle: stub out cpuidle_poll_state_init() without CONFIG_CPU_IDLE Arnd Bergmann
2018-02-20 15:18 ` Rafael J. Wysocki

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®