|
@@ -515,12 +515,6 @@ asmlinkage __visible void __init start_kernel(void)
|
|
|
smp_setup_processor_id();
|
|
|
debug_objects_early_init();
|
|
|
|
|
|
- /*
|
|
|
- * Set up the initial canary ASAP:
|
|
|
- */
|
|
|
- add_latent_entropy();
|
|
|
- boot_init_stack_canary();
|
|
|
-
|
|
|
cgroup_init_early();
|
|
|
|
|
|
local_irq_disable();
|
|
@@ -534,6 +528,11 @@ asmlinkage __visible void __init start_kernel(void)
|
|
|
page_address_init();
|
|
|
pr_notice("%s", linux_banner);
|
|
|
setup_arch(&command_line);
|
|
|
+ /*
|
|
|
+ * Set up the the initial canary and entropy after arch
|
|
|
+ */
|
|
|
+ add_latent_entropy();
|
|
|
+ boot_init_stack_canary();
|
|
|
mm_init_cpumask(&init_mm);
|
|
|
setup_command_line(command_line);
|
|
|
setup_nr_cpu_ids();
|