diff options
| author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2018-08-17 11:35:18 -0400 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2018-08-17 11:35:18 -0400 |
| commit | fb4c0821c89537bdcc89cd3ac255f6e5e81f8f46 (patch) | |
| tree | 7200e0f59a3ffd0bcfbcbc854d90641519553a92 /init | |
| parent | d2cab794f25e20ba804ac7d3e22fd853602d1438 (diff) | |
| parent | 9d5cd9f2a4d7eb445963cafd9872186a9a262077 (diff) | |
| download | linux-rt-fb4c0821c89537bdcc89cd3ac255f6e5e81f8f46.tar.gz | |
Merge tag 'v4.14.63' into v4.14-rt
This is the 4.14.63 stable release
Conflicts:
init/main.c
kernel/softirq.c
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 c34e0c4a59b5..c86f3d3b9a72 100644 --- a/init/main.c +++ b/init/main.c @@ -544,8 +544,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); page_alloc_init(); |