From: John Audia <therealgraysky@proton.me>
Date: Mon, 25 Jul 2022 14:16:43 +0000 (-0400)
Subject: x86: update defconfig for 5.10.133
X-Git-Tag: v23.05.0-rc1~2888
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=56760c0b1316a0e379ff141b895c2929f0dace8d;p=openwrt%2Fopenwrt.git

x86: update defconfig for 5.10.133

Add some new/missing symbols relating to speculative execution mitigations[1].

1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/diff/arch/x86/Kconfig?id=v5.10.133&id2=v5.10.132

Signed-off-by: John Audia <therealgraysky@proton.me>
---

diff --git a/target/linux/x86/config-5.10 b/target/linux/x86/config-5.10
index ec27bb7945..13a698d05d 100644
--- a/target/linux/x86/config-5.10
+++ b/target/linux/x86/config-5.10
@@ -52,6 +52,9 @@ CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
 # CONFIG_CPU_FREQ_GOV_USERSPACE is not set
 CONFIG_CPU_FREQ_STAT=y
+CONFIG_CPU_IBPB_ENTRY=y
+CONFIG_CPU_IBRS_ENTRY=y
+# CONFIG_SLS is not set
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_SUP_AMD=y
@@ -62,11 +65,13 @@ CONFIG_CPU_SUP_INTEL=y
 CONFIG_CPU_SUP_TRANSMETA_32=y
 CONFIG_CPU_SUP_UMC_32=y
 CONFIG_CPU_SUP_ZHAOXIN=y
+CONFIG_CPU_UNRET_ENTRY=y
 CONFIG_CRASH_CORE=y
 CONFIG_CRC16=y
 CONFIG_CRYPTO_CRC32=y
 CONFIG_CRYPTO_CRC32C=y
 # CONFIG_CRYPTO_CRC32_PCLMUL is not set
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
 CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
 CONFIG_CRYPTO_RNG2=y
 # CONFIG_CRYPTO_SERPENT_SSE2_586 is not set
@@ -168,7 +173,6 @@ CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INPUT=y
 CONFIG_INPUT_KEYBOARD=y
 CONFIG_INSTRUCTION_DECODER=y
-# CONFIG_INTEL_INT0002_VGPIO is not set
 # CONFIG_INTEL_PCH_THERMAL is not set
 # CONFIG_INTEL_POWERCLAMP is not set
 # CONFIG_INTEL_SCU_PCI is not set
@@ -292,6 +296,7 @@ CONFIG_PROC_PID_ARCH_STATUS=y
 CONFIG_RATIONAL=y
 CONFIG_RD_BZIP2=y
 CONFIG_RD_GZIP=y
+CONFIG_RETHUNK=y
 CONFIG_RETPOLINE=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_MC146818_LIB=y
@@ -317,6 +322,7 @@ CONFIG_SG_POOL=y
 # CONFIG_SMSC_SCH311X_WDT is not set
 CONFIG_SPARSEMEM_STATIC=y
 CONFIG_SPARSE_IRQ=y
+CONFIG_SPECULATION_MITIGATIONS=y
 CONFIG_SRCU=y
 # CONFIG_STATIC_CALL_SELFTEST is not set
 CONFIG_SYSCTL_EXCEPTION_TRACE=y