[openwrt/openwrt] armvirt: refresh 5.10 config

[LEDE Commits]

hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/fcb68aa425a8b3d1ea3959a693d9dc606e261454

commit fcb68aa425a8b3d1ea3959a693d9dc606e261454
Author: Aleksander Jan Bajkowski <olek2 at wp.pl>
AuthorDate: Mon Mar 21 22:01:42 2022 +0100

    armvirt: refresh 5.10 config
    
    This was done by executing these commands:
    $ make kernel_oldconfig CONFIG_TARGET=subtarget
    $ make kernel_oldconfig CONFIG_TARGET=subtarget_platform
    
    Signed-off-by: Aleksander Jan Bajkowski <olek2 at wp.pl>
---
 target/linux/armvirt/64/config-5.10 | 2 +-
 target/linux/armvirt/config-5.10    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/target/linux/armvirt/64/config-5.10 b/target/linux/armvirt/64/config-5.10
index 27d86cf8a7..1389a2a60a 100644
--- a/target/linux/armvirt/64/config-5.10
+++ b/target/linux/armvirt/64/config-5.10
@@ -41,6 +41,7 @@ CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BLK_PM=y
 CONFIG_CAVIUM_TX2_ERRATUM_219=y
+CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG=y
 CONFIG_CLK_SP810=y
 CONFIG_CLK_VEXPRESS_OSC=y
 # CONFIG_COMPAT_32BIT_TIME is not set
@@ -93,7 +94,6 @@ CONFIG_FRAME_POINTER=y
 CONFIG_FSL_ERRATUM_A008585=y
 CONFIG_FUJITSU_ERRATUM_010001=y
 CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
-CONFIG_GENERIC_CPU_VULNERABILITIES=y
 CONFIG_GENERIC_CSUM=y
 CONFIG_GPIO_GENERIC=y
 CONFIG_GPIO_GENERIC_PLATFORM=y
diff --git a/target/linux/armvirt/config-5.10 b/target/linux/armvirt/config-5.10
index c63b169607..c4479a6990 100644
--- a/target/linux/armvirt/config-5.10
+++ b/target/linux/armvirt/config-5.10
@@ -50,6 +50,7 @@ CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
 CONFIG_GENERIC_CPU_AUTOPROBE=y
+CONFIG_GENERIC_CPU_VULNERABILITIES=y
 CONFIG_GENERIC_EARLY_IOREMAP=y
 CONFIG_GENERIC_GETTIMEOFDAY=y
 CONFIG_GENERIC_IDLE_POLL_SETUP=y