cpu/hotplug: fix unused function warning
PATCH 1/1 cpu/hotplug: fix unused function warning
The cpuhp_is_ap_state() function is no longer called outside of the CONFIG_SMP #ifdef section, causing a harmless warning:
kernel/cpu.c:129:13: error: 'cpuhp_is_ap_state' defined but not used [-Werror=unused-function]
This moves the function into the #ifdef to get a clean build again.
Fixes 17a2f1ced028 ("cpu/hotplug: Merge cpuhp_bp_states and cpuhp_ap_states")
Signed-off-by Arnd Bergmann <[email protected]>
--- kernel/cpu.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
kernel/cpu.c +9 -9
@@ -126,15 +126,6 @@ struct cpuhp_step {static DEFINE_MUTEX (cpuhp_state_mutex);static struct cpuhp_step cpuhp_hp_states[]; -static bool cpuhp_is_ap_state (enum cpuhp_state state) -{ -/* -* The extra check for CPUHP_TEARDOWN_CPU is only for documentation -* purposes as that state is handled explicitly in cpu_down. -*/ -return state >CPUHP_BRINGUP_CPU && state !=CPUHP_TEARDOWN_CPU ; -} -static struct cpuhp_step *cpuhp_get_step (enum cpuhp_state state) {return cpuhp_hp_states + state;
@@ -235,6 +226,15 @@ static int cpuhp_invoke_callback(unsigned int cpu, enum cpuhp_state state, }#ifdef CONFIG_SMP +static bool cpuhp_is_ap_state (enum cpuhp_state state) +{ +/* +* The extra check for CPUHP_TEARDOWN_CPU is only for documentation +* purposes as that state is handled explicitly in cpu_down. +*/ +return state >CPUHP_BRINGUP_CPU && state !=CPUHP_TEARDOWN_CPU ; +} +static inline void wait_for_ap_thread (struct cpuhp_cpu_state *st,bool bringup) {struct completion *done = bringup ? &st->done_up : &st->done_down;
Signature · 1 line
2.9.0
tip-bot for Arnd Bergmann
merge bot[tip:smp/hotplug] cpu/hotplug: Fix unused function warning
cpu/hotplug: Fix unused function warning
Commit-ID: fcb3029a8d89487470f2e175645a9a993949233c Gitweb: https://git.kernel.org/tip/fcb3029a8d89487470f2e175645a9a993949233c Author: Arnd Bergmann <[email protected]> AuthorDate: Thu, 15 Mar 2018 16:38:04 +0100 Committer: Thomas Gleixner <[email protected]> CommitDate: Thu, 15 Mar 2018 20:34:40 +0100
cpu/hotplug: Fix unused function warning
The cpuhp_is_ap_state() function is no longer called outside of the CONFIG_SMP #ifdef section, causing a harmless warning:
kernel/cpu.c:129:13: error: 'cpuhp_is_ap_state' defined but not used [-Werror=unused-function]
This moves the function into the #ifdef to get a clean build again.
Fixes 17a2f1ced028 ("cpu/hotplug: Merge cpuhp_bp_states and cpuhp_ap_states")
Signed-off-by Arnd Bergmann <[email protected]>
Signed-off-by Thomas Gleixner <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Sebastian Andrzej Siewior <[email protected]>
Cc Lai Jiangshan <[email protected]>
Cc "Paul E. McKenney" <[email protected]>
--- kernel/cpu.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
kernel/cpu.c +9 -9
@@ -126,15 +126,6 @@ struct cpuhp_step {static DEFINE_MUTEX (cpuhp_state_mutex);static struct cpuhp_step cpuhp_hp_states[]; -static bool cpuhp_is_ap_state (enum cpuhp_state state) -{ -/* -* The extra check for CPUHP_TEARDOWN_CPU is only for documentation -* purposes as that state is handled explicitly in cpu_down. -*/ -return state >CPUHP_BRINGUP_CPU && state !=CPUHP_TEARDOWN_CPU ; -} -static struct cpuhp_step *cpuhp_get_step (enum cpuhp_state state) {return cpuhp_hp_states + state;
@@ -235,6 +226,15 @@ err: }#ifdef CONFIG_SMP +static bool cpuhp_is_ap_state (enum cpuhp_state state) +{ +/* +* The extra check for CPUHP_TEARDOWN_CPU is only for documentation +* purposes as that state is handled explicitly in cpu_down. +*/ +return state >CPUHP_BRINGUP_CPU && state !=CPUHP_TEARDOWN_CPU ; +} +static inline void wait_for_ap_thread (struct cpuhp_cpu_state *st,bool bringup) {struct completion *done = bringup ? &st->done_up : &st->done_down;