summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2022-07-23 12:09:00 -0700
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2022-07-23 12:09:00 -0700
commitb2663db4a9b4a2752762f84b0472f81f9c00c32c (patch)
tree010b1e4d1649c581eed8b7e51a3d12cfd09cbe04 /config
parentUpdated to 5.18.12 (diff)
downloadlinux-b2663db4a9b4a2752762f84b0472f81f9c00c32c.tar.xz
Updated to 5.18.14
Diffstat (limited to 'config')
-rw-r--r--config14
1 files changed, 10 insertions, 4 deletions
diff --git a/config b/config
index ab260a3..51cd786 100644
--- a/config
+++ b/config
@@ -356,9 +356,6 @@ CONFIG_X86_FEATURE_NAMES=y
CONFIG_X86_X2APIC=y
CONFIG_X86_MPPARSE=y
# CONFIG_GOLDFISH is not set
-CONFIG_RETPOLINE=y
-CONFIG_CC_HAS_SLS=y
-CONFIG_SLS=y
CONFIG_X86_CPU_RESCTRL=y
# CONFIG_X86_EXTENDED_PLATFORM is not set
CONFIG_X86_INTEL_LPSS=y
@@ -566,6 +563,16 @@ CONFIG_HAVE_LIVEPATCH=y
# CONFIG_LIVEPATCH is not set
# end of Processor type and features
+CONFIG_CC_HAS_SLS=y
+CONFIG_CC_HAS_RETURN_THUNK=y
+CONFIG_SPECULATION_MITIGATIONS=y
+CONFIG_PAGE_TABLE_ISOLATION=y
+CONFIG_RETPOLINE=y
+CONFIG_RETHUNK=y
+CONFIG_CPU_UNRET_ENTRY=y
+CONFIG_CPU_IBPB_ENTRY=y
+CONFIG_CPU_IBRS_ENTRY=y
+CONFIG_SLS=y
CONFIG_ARCH_HAS_ADD_PAGES=y
CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y
@@ -10318,7 +10325,6 @@ CONFIG_SECURITY_DMESG_RESTRICT=y
CONFIG_SECURITY=y
CONFIG_SECURITYFS=y
CONFIG_SECURITY_NETWORK=y
-CONFIG_PAGE_TABLE_ISOLATION=y
CONFIG_SECURITY_INFINIBAND=y
CONFIG_SECURITY_NETWORK_XFRM=y
CONFIG_SECURITY_PATH=y