From 2938e2a2832add440cff3c8865caf20784ae77ed Mon Sep 17 00:00:00 2001
From: Chenyang Zhong <zhongcy95@gmail.com>
Date: Sun, 3 Jul 2022 03:41:18 -0400
Subject: [PATCH] Revert "init: Move stack canary initialization after
 setup_arch"

We will correct this after merging upstream.

This reverts commit d4a32a7a132dc0a5ef2d3ee1839a2c71a248cfc3.
---
 init/main.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/init/main.c b/init/main.c
index ed0cb3474428..5e0574402c0b 100644
--- a/init/main.c
+++ b/init/main.c
@@ -506,6 +506,11 @@ 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();
@@ -519,10 +524,6 @@ 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();