summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
Diffstat (limited to 'init')
-rw-r--r--init/main.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/init/main.c b/init/main.c
index 0e8849f74561..cc48053bb39f 100644
--- a/init/main.c
+++ b/init/main.c
@@ -495,7 +495,7 @@ asmlinkage __visible void __init start_kernel(void)
495 debug_objects_early_init(); 495 debug_objects_early_init();
496 496
497 /* 497 /*
498 * Set up the the initial canary ASAP: 498 * Set up the initial canary ASAP:
499 */ 499 */
500 boot_init_stack_canary(); 500 boot_init_stack_canary();
501 501
@@ -504,10 +504,10 @@ asmlinkage __visible void __init start_kernel(void)
504 local_irq_disable(); 504 local_irq_disable();
505 early_boot_irqs_disabled = true; 505 early_boot_irqs_disabled = true;
506 506
507/* 507 /*
508 * Interrupts are still disabled. Do necessary setups, then 508 * Interrupts are still disabled. Do necessary setups, then
509 * enable them 509 * enable them.
510 */ 510 */
511 boot_cpu_init(); 511 boot_cpu_init();
512 page_address_init(); 512 page_address_init();
513 pr_notice("%s", linux_banner); 513 pr_notice("%s", linux_banner);
@@ -1026,6 +1026,8 @@ static noinline void __init kernel_init_freeable(void)
1026 1026
1027 workqueue_init(); 1027 workqueue_init();
1028 1028
1029 init_mm_internals();
1030
1029 do_pre_smp_initcalls(); 1031 do_pre_smp_initcalls();
1030 lockup_detector_init(); 1032 lockup_detector_init();
1031 1033