smp: Avoid 'setup_max_cpus' namespace collision/shadowing

bringup_nonboot_cpus() gets passed the 'setup_max_cpus'
variable in init/main.c - which is also the name of the parameter,
shadowing the name.

To reduce confusion and to allow the 'setup_max_cpus' value
to be #defined in the <linux/smp.h> header, use the 'max_cpus'
name for the function parameter name.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org

diff --git a/include/linux/cpu.h b/include/linux/cpu.h
index dcb89c9871640f0a92c85c5f16d94a8e199c3a23..61a0ddf2bef69fdf0aaddac859a436b72bd81bca 100644 (file)
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
@@ -112,7 +112,7 @@ void notify_cpu_starting(unsigned int cpu);
 extern void cpu_maps_update_begin(void);
 extern void cpu_maps_update_done(void);
 int bringup_hibernate_cpu(unsigned int sleep_cpu);
-void bringup_nonboot_cpus(unsigned int setup_max_cpus);
+void bringup_nonboot_cpus(unsigned int max_cpus);
 
 #else  /* CONFIG_SMP */
 #define cpuhp_tasks_frozen     0

diff --git a/kernel/cpu.c b/kernel/cpu.c
index e6ec3ba4950b48c0afa6665aba2824456dc409f5..023ddf8d625a8ec1e888311a28f60bf0fcb95d1b 100644 (file)
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -1909,14 +1909,14 @@ static bool __init cpuhp_bringup_cpus_parallel(unsigned int ncpus)
 static inline bool cpuhp_bringup_cpus_parallel(unsigned int ncpus) { return false; }
 #endif /* CONFIG_HOTPLUG_PARALLEL */
 
-void __init bringup_nonboot_cpus(unsigned int setup_max_cpus)
+void __init bringup_nonboot_cpus(unsigned int max_cpus)
 {
        /* Try parallel bringup optimization if enabled */
-       if (cpuhp_bringup_cpus_parallel(setup_max_cpus))
+       if (cpuhp_bringup_cpus_parallel(max_cpus))
                return;
 
        /* Full per CPU serialized bringup */
-       cpuhp_bringup_mask(cpu_present_mask, setup_max_cpus, CPUHP_ONLINE);
+       cpuhp_bringup_mask(cpu_present_mask, max_cpus, CPUHP_ONLINE);
 }
 
 #ifdef CONFIG_PM_SLEEP_SMP