diff options
Diffstat (limited to 'init/main.c')
| -rw-r--r-- | init/main.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/init/main.c b/init/main.c index 011005772ccc..48e8370966ce 100644 --- a/init/main.c +++ b/init/main.c @@ -88,7 +88,7 @@ #include <asm/setup.h> #include <asm/sections.h> #include <asm/cacheflush.h> - +#include <soc/qcom/boot_stats.h> static int kernel_init(void *); extern void init_IRQ(void); @@ -507,11 +507,6 @@ asmlinkage __visible void __init start_kernel(void) smp_setup_processor_id(); debug_objects_early_init(); - /* - * Set up the the initial canary ASAP: - */ - boot_init_stack_canary(); - cgroup_init_early(); local_irq_disable(); @@ -525,6 +520,10 @@ 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 ASAP: + */ + boot_init_stack_canary(); mm_init_cpumask(&init_mm); setup_command_line(command_line); setup_nr_cpu_ids(); @@ -965,6 +964,7 @@ static int __ref kernel_init(void *unused) numa_default_policy(); flush_delayed_fput(); + place_marker("M : Kernel End"); if (ramdisk_execute_command) { ret = run_init_process(ramdisk_execute_command); |