--- /dev/null
+From 3bb3b079fe326144883338b8c55eff6bf8a1b6b6 Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Thu, 7 Oct 2021 08:18:59 +0200
+Subject: Revert "arm64: Mark __stack_chk_guard as __ro_after_init"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit 69e450b170995e8a4e3eb94fb14c822553124870 which is
+commit 9fcb2e93f41c07a400885325e7dbdfceba6efaec upstream.
+
+Turns out to break the build when CONFIG_CC_STACKPROTECTOR=y.
+
+Reported-by: Hans-Christian Egtvedt <hegtvedt@cisco.com>
+Link: https://lore.kernel.org/r/DM5PR11MB001226B8D03B8CC8FA093AC6DDB09@DM5PR11MB0012.namprd11.prod.outlook.com
+Cc: Dan Li <ashimida@linux.alibaba.com>
+Cc: Mark Rutland <mark.rutland@arm.com>
+Cc: Catalin Marinas <catalin.marinas@arm.com>
+Cc: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/arm64/kernel/process.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/arm64/kernel/process.c
++++ b/arch/arm64/kernel/process.c
+@@ -55,7 +55,7 @@
+
+ #ifdef CONFIG_CC_STACKPROTECTOR
+ #include <linux/stackprotector.h>
+-unsigned long __stack_chk_guard __ro_after_init;
++unsigned long __stack_chk_guard __read_mostly;
+ EXPORT_SYMBOL(__stack_chk_guard);
+ #endif
+