Without CONFIG_SMP, we get a harmless warning about
an unused variable:

kernel/cpu.c: In function 'boot_cpu_state_init':
kernel/cpu.c:1778:6: error: unused variable 'cpu' [-Werror=unused-variable]

This reworks the function to have the declaration inside
of the #ifdef.

Fixes: faeb334286b7 ("rcu: Migrate callbacks earlier in the CPU-offline 
timeline")
Signed-off-by: Arnd Bergmann <a...@arndb.de>
---
 kernel/cpu.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/cpu.c b/kernel/cpu.c
index f13ad79e785d..9cd4fc35a66f 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -1775,11 +1775,11 @@ void __init boot_cpu_init(void)
  */
 void __init boot_cpu_state_init(void)
 {
+#ifdef CONFIG_SMP
        int cpu;
 
-       per_cpu_ptr(&cpuhp_state, smp_processor_id())->state = CPUHP_ONLINE;
-#ifdef CONFIG_SMP
        for_each_possible_cpu(cpu)
                per_cpu_ptr(&cpuhp_state, cpu)->cpu = cpu;
 #endif
+       per_cpu_ptr(&cpuhp_state, smp_processor_id())->state = CPUHP_ONLINE;
 }
-- 
2.9.0

Reply via email to