Merge tag 'x86-apic-2024-03-10' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-block.git] / kernel / cpu.c

diff --git a/kernel/cpu.c b/kernel/cpu.c
index d3dbc8cdc8a963c0ff51ff160b7f71a6428ef357..8f6affd051f77564f96ca4682a58d0c131f62c56 100644 (file)
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -1905,14 +1905,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