From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 7 Oct 2021 06:18:59 +0000 (+0200)
Subject: Revert "arm64: Mark __stack_chk_guard as __ro_after_init"
X-Git-Tag: v4.4.287~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43aa7a41ea67d8f69182ddfc4a3cc6c337fbafe7;p=thirdparty%2Fkernel%2Fstable.git

Revert "arm64: Mark __stack_chk_guard as __ro_after_init"

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>
---

diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c
index 6cd79888944e6..10d6627673cbf 100644
--- 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