diff options
| -rw-r--r-- | include/linux/cpu.h | 2 | ||||
| -rw-r--r-- | init/main.c | 2 | ||||
| -rw-r--r-- | kernel/cpu.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/cpu.h b/include/linux/cpu.h index 917829b27350..f1da93d0c34f 100644 --- a/include/linux/cpu.h +++ b/include/linux/cpu.h @@ -29,7 +29,7 @@ struct cpu { }; extern void boot_cpu_init(void); -extern void boot_cpu_state_init(void); +extern void boot_cpu_hotplug_init(void); extern int register_cpu(struct cpu *cpu, int num); extern struct device *get_cpu_device(unsigned cpu); diff --git a/init/main.c b/init/main.c index f22957afb37e..4313772d634a 100644 --- a/init/main.c +++ b/init/main.c @@ -509,8 +509,8 @@ asmlinkage __visible void __init start_kernel(void) setup_command_line(command_line); setup_nr_cpu_ids(); setup_per_cpu_areas(); - boot_cpu_state_init(); smp_prepare_boot_cpu(); /* arch-specific boot-cpu hooks */ + boot_cpu_hotplug_init(); build_all_zonelists(NULL, NULL); page_alloc_init(); diff --git a/kernel/cpu.c b/kernel/cpu.c index 967163fb90a8..e93635e2376f 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -1944,7 +1944,7 @@ void __init boot_cpu_init(void) /* * Must be called _AFTER_ setting up the per_cpu areas */ -void __init boot_cpu_state_init(void) +void __init boot_cpu_hotplug_init(void) { per_cpu_ptr(&cpuhp_state, smp_processor_id())->state = CPUHP_ONLINE; } |