Merge "init: Move stack canary initialization after setup_arch" into msm-4.8 (b808965c) · Commits · e / devices / android_kernel_fairphone_FP3

init/main.c

+4 −5

Original line number	Diff line number	Diff line
		@@ -485,11 +485,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();
		@@ -503,6 +498,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();