- up to 4.14.14; SECURITY: adds retpoline which mitigates Spectre variant 2 attack

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

diff --git a/kernel-x86.config b/kernel-x86.config
index e640bca0b4ec031fa4f9de618d3f96c728a4fc56..98676d7a75073fc8bc3704a0d6c40498f42de60b 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
@@ -156,11 +157,7 @@ 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 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
@@ -386,6 +383,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 ***
 #-