- 4.14.303

[packages/kernel.git] / kernel-x86.config

diff --git a/kernel-x86.config b/kernel-x86.config
index ee1a744887eff2e724be1a3953a81d12a75fc7a9..e00b0e90f07e260f13c66f79708d4ada88fedcbf 100644 (file)
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -19,6 +19,7 @@ SMP x86=y
 X86_X2APIC all=y
 X86_MPPARSE x86=y
 X86_BIGSMP i386=y
+RETPOLINE x86=y
 X86_EXTENDED_PLATFORM i386=y x86_64=y
 X86_NUMACHIP all=n
 X86_VSMP x86_64=n
@@ -92,11 +93,14 @@ X86_RESERVE_LOW x86=64
 MATH_EMULATION i386=y i686=n pentium3=n pentium4=n athlon=n
 MTRR x86=y
 MTRR_SANITIZER x86=y
-MTRR_SANITIZER_ENABLE_DEFAULT x86=0
+MTRR_SANITIZER_ENABLE_DEFAULT x86=1
 MTRR_SANITIZER_SPARE_REG_NR_DEFAULT x86=1
 X86_PAT x86=y
 X86_INTEL_MPX x86=y
 X86_INTEL_MEMORY_PROTECTION_KEYS all=y
+X86_INTEL_TSX_MODE_OFF x86=y
+X86_INTEL_TSX_MODE_ON x86=n
+X86_INTEL_TSX_MODE_AUTO x86=n
 EFI x86=y
 EFI_STUB all=y
 SECCOMP x86=y
@@ -363,7 +367,6 @@ SPARSE_IRQ i386=y x86_64=y
 DEBUG_STACK_USAGE x86=n
 DEBUG_PER_CPU_MAPS x86=n
 DEBUG_STACKOVERFLOW x86=n
-#- file lib/Kconfig.kmemcheck goes here
 #- file lib/Kconfig.kasan goes here
 KCOV all=n
 WW_MUTEX_SELFTEST all=m
@@ -382,6 +385,19 @@ IO_STRICT_DEVMEM x86=y
 ARCH_USES_HIGH_VMA_FLAGS all=y
 ARCH_HAS_PKEYS all=y
 
+#-
+#- *** FILE: security/Kconfig ***
+#-
+#- file security/keys/Kconfig goes here
+PAGE_TABLE_ISOLATION x86_64=y
+#- file security/selinux/Kconfig goes here
+#- file security/smack/Kconfig goes here
+#- file security/tomoyo/Kconfig goes here
+#- file security/apparmor/Kconfig goes here
+#- file security/loadpin/Kconfig goes here
+#- file security/yama/Kconfig goes here
+#- file security/integrity/Kconfig goes here
+
 #-
 #- *** FILE: sound/x86/Kconfig ***
 #-