Skip to content

Commit

Permalink
PM: cpuidle: Fix cpuidle_poll_state_init() prototype
Browse files Browse the repository at this point in the history
commit d7212cf upstream.

Commit f859422 (x86: PM: Make APM idle driver initialize polling
state) made apm_init() call cpuidle_poll_state_init(), but that only
is defined for CONFIG_CPU_IDLE set, so make the empty stub of it
available for CONFIG_CPU_IDLE unset too to fix the resulting build
issue.

Fixes: f859422 (x86: PM: Make APM idle driver initialize polling state)
Signed-off-by: Rafael J. Wysocki <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
  • Loading branch information
rafaeljw authored and gregkh committed Feb 22, 2018
1 parent c59cce7 commit e578fed
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion include/linux/cpuidle.h
Original file line number Diff line number Diff line change
Expand Up @@ -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) {}
Expand Down

0 comments on commit e578fed

Please sign in to comment.