diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2021-10-07 09:54:31 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2021-10-07 09:54:31 +0200 |
| commit | 908f942eb5a641a982f78aee19cea4a344631920 (patch) | |
| tree | 516da3a6738717ecf58443b15c66cbdbd8bd30ee /arch | |
| parent | 2e7b242209a1b320135bab3822ad45281a11deb3 (diff) | |
| parent | a123b2f4737a9f4e34e92e502972b6388f90133f (diff) | |
Merge 4.4.287 into android-4.4-p
Changes in 4.4.287
Revert "arm64: Mark __stack_chk_guard as __ro_after_init"
Linux 4.4.287
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I51e06ec62e6fcc1246ae88edcd79b9ef56fb5e23
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/kernel/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c index a84ba939ccd1..236120fc4dbc 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -60,7 +60,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 |