diff options
| author | Julia Cartwright <julia@ni.com> | 2018-12-20 15:13:04 -0600 |
|---|---|---|
| committer | Julia Cartwright <julia@ni.com> | 2018-12-20 15:13:04 -0600 |
| commit | 686b90c067f26c237b5dd2b5cfd3c98ac8c5a8c2 (patch) | |
| tree | 94443ded6a8148b10ea94c2fe85592baa27fec01 /init | |
| parent | 7b1eb0c24b63fe0d8b0d2e1129b0984e57a3b316 (diff) | |
| parent | 93e02ae4200184bab43ce29966e895826a756a37 (diff) | |
Merge tag 'v4.9.120' into v4.9-rt
This is the 4.9.120 stable release
Diffstat (limited to 'init')
| -rw-r--r-- | init/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c index 8ac3d15ddc1a..8196cc82b48c 100644 --- a/init/main.c +++ b/init/main.c @@ -510,8 +510,8 @@ asmlinkage __visible void __init start_kernel(void) setup_nr_cpu_ids(); setup_per_cpu_areas(); softirq_early_init(); - 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(); |