- 4.4.231

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

diff --git a/kernel-x86.config b/kernel-x86.config
index 595aa29644460a3d832bc32c3357a59dc780491c..862066ead2e8aa1473c39af76f8a6744b7330916 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
@@ -93,6 +94,9 @@ MTRR_SANITIZER_ENABLE_DEFAULT x86=0
 MTRR_SANITIZER_SPARE_REG_NR_DEFAULT x86=1
 X86_PAT x86=y
 X86_INTEL_MPX x86=y
+X86_INTEL_TSX_MODE_OFF all=y
+X86_INTEL_TSX_MODE_ON all=n
+X86_INTEL_TSX_MODE_AUTO all=n
 EFI x86=y
 EFI_STUB all=y
 SECCOMP x86=y
@@ -154,11 +158,8 @@ X86_X32 x86_64=y
 #- file drivers/firmware/Kconfig goes here
 #- file fs/Kconfig goes here
 #- file arch/x86/Kconfig.debug goes here
-#-
-#- *** FILE: security/Kconfig ***
-#-
+#- file kernel/vserver/Kconfig goes here
 #- file security/Kconfig goes here
-PAGE_TABLE_ISOLATION x86_64=y
 #- file crypto/Kconfig goes here
 #- file arch/x86/kvm/Kconfig goes here
 #- file lib/Kconfig goes here
@@ -370,6 +371,18 @@ MEMTEST x86=n
 #- file samples/Kconfig goes here
 #- file lib/Kconfig.kgdb goes here
 
+#-
+#- *** 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/yama/Kconfig goes here
+#- file security/integrity/Kconfig goes here
+
 #-
 #- *** PROBABLY REMOVED OPTIONS ***
 #-