X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=kernel-x86.config;h=87dd5a8651c6ce92476a7e6996ee63b71430b54c;hb=4e1a4c84e6398a77c78048ea1fa3fe653dce7712;hp=2e16eefadf1d3732613de49bd1b5cb2334d117b7;hpb=5afbbe0d2cf36a3aaa279aba8ceed469c01d3f78;p=packages%2Fkernel.git

diff --git a/kernel-x86.config b/kernel-x86.config
index 2e16eefa..87dd5a86 100644
--- 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
@@ -60,6 +61,7 @@ X86_MCE_INTEL all=y
 X86_MCE_AMD all=y
 X86_ANCIENT_MCE all=y
 X86_MCE_INJECT x86=m
+#- file arch/x86/events/Kconfig goes here
 X86_LEGACY_VM86 i386=n
 VM86 i386=y
 X86_VSYSCALL_EMULATION x86=y
@@ -94,6 +96,9 @@ 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
@@ -110,8 +115,8 @@ BOOTPARAM_HOTPLUG_CPU0 all=n
 DEBUG_HOTPLUG_CPU0 all=n
 COMPAT_VDSO x86=n
 LEGACY_VSYSCALL_NATIVE all=n
-LEGACY_VSYSCALL_EMULATE all=n
-LEGACY_VSYSCALL_NONE all=y
+LEGACY_VSYSCALL_EMULATE all=y
+LEGACY_VSYSCALL_NONE all=n
 CMDLINE_BOOL x86=n
 #- file kernel/livepatch/Kconfig goes here
 #- file kernel/power/Kconfig goes here
@@ -148,12 +153,12 @@ RAPIDIO all=y
 IA32_EMULATION x86_64=y
 IA32_AOUT x86_64=y
 X86_X32 x86_64=y
-VMD all=m
 #- file net/Kconfig goes here
 #- file drivers/Kconfig goes here
 #- file drivers/firmware/Kconfig goes here
 #- file fs/Kconfig goes here
 #- file arch/x86/Kconfig.debug goes here
+#- file kernel/vserver/Kconfig goes here
 #- file security/Kconfig goes here
 #- file crypto/Kconfig goes here
 #- file arch/x86/kvm/Kconfig goes here
@@ -291,7 +296,6 @@ GPIO_STA2X11 all=y
 #- *** FILE: drivers/iommu/Kconfig ***
 #-
 AMD_IOMMU x86_64=y
-AMD_IOMMU_STATS x86_64=n
 
 #-
 #- *** FILE: drivers/media/pci/sta2x11/Kconfig ***
@@ -312,6 +316,11 @@ V4L_RADIO_ISA_DRIVERS all=y
 NET_VENDOR_CIRRUS all=y
 CS89x0_PLATFORM all=y
 
+#-
+#- *** FILE: drivers/pci/host/Kconfig ***
+#-
+VMD all=m
+
 #-
 #- *** FILE: drivers/staging/comedi/Kconfig ***
 #-
@@ -359,7 +368,6 @@ DEBUG_STACKOVERFLOW x86=n
 #- file lib/Kconfig.kmemcheck goes here
 #- file lib/Kconfig.kasan goes here
 KCOV all=n
-DEBUG_STRICT_USER_COPY_CHECKS x86=n
 #- file kernel/trace/Kconfig goes here
 MEMTEST x86=n
 #- file samples/Kconfig goes here
@@ -373,3 +381,22 @@ 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
+
+#-
+#- *** PROBABLY REMOVED OPTIONS ***
+#-
+AMD_IOMMU_STATS x86_64=n
+DEBUG_STRICT_USER_COPY_CHECKS x86=n