X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=kernel-x86.config;h=04875b80a38f2e8fb6c3b01f02d9df1dd4ce5310;hb=0f36d20238242a6566c24cf60d5c8f208bdaeaf6;hp=e253239e6a429b13c1d650e8b100ee35a11621c1;hpb=be52b2493105e67b80c5d7c0939df35c0ba6377b;p=packages%2Fkernel.git

diff --git a/kernel-x86.config b/kernel-x86.config
index e253239e..04875b80 100644
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -19,12 +19,13 @@ 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
 X86_UV i386=n x86_64=n
 X86_GOLDFISH all=n
-X86_INTEL_MID i386=n
+X86_INTEL_MID all=n
 X86_INTEL_QUARK i386=y
 X86_INTEL_LPSS all=y
 X86_RDC321X i386=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
@@ -93,6 +95,7 @@ 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_MEMORY_PROTECTION_KEYS all=y
 EFI x86=y
 EFI_STUB all=y
 SECCOMP x86=y
@@ -109,8 +112,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
@@ -130,7 +133,6 @@ PCI_GOMMCONFIG i386=n
 PCI_GODIRECT i386=n
 PCI_GOANY i386=y
 PCI_MMCONFIG x86=y
-#- file drivers/pci/pcie/Kconfig goes here
 #- file drivers/pci/Kconfig goes here
 ISA i386=y
 EISA i386=y
@@ -142,7 +144,6 @@ ALIX i486=y i586=y i686=y
 NET5501 i486=y i586=y i686=y
 GEOS i486=y i586=y i686=y
 #- file drivers/pcmcia/Kconfig goes here
-#- file drivers/pci/hotplug/Kconfig goes here
 RAPIDIO all=y
 #- file drivers/rapidio/Kconfig goes here
 #- file fs/Kconfig.binfmt goes here
@@ -154,6 +155,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 kernel/vserver/Kconfig goes here
 #- file security/Kconfig goes here
 #- file crypto/Kconfig goes here
 #- file arch/x86/kvm/Kconfig goes here
@@ -200,12 +202,10 @@ CPU_SUP_CENTAUR x86=y
 #- *** FILE: arch/x86/Kconfig.debug ***
 #-
 #- file lib/Kconfig.debug goes here
-STRICT_DEVMEM x86=y
 X86_VERBOSE_BOOTUP x86=n
 EARLY_PRINTK x86=y
 EARLY_PRINTK_DBGP x86=n
 X86_PTDUMP x86=n
-DEBUG_RODATA all=y
 DEBUG_RODATA_TEST all=n
 DEBUG_SET_MODULE_RONX all=y
 DEBUG_NX_TEST x86=m
@@ -293,7 +293,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 ***
@@ -314,6 +313,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 ***
 #-
@@ -360,13 +364,36 @@ DEBUG_PER_CPU_MAPS x86=n
 DEBUG_STACKOVERFLOW x86=n
 #- file lib/Kconfig.kmemcheck goes here
 #- file lib/Kconfig.kasan goes here
-DEBUG_STRICT_USER_COPY_CHECKS x86=n
+KCOV all=n
 #- file kernel/trace/Kconfig goes here
 MEMTEST x86=n
 #- file samples/Kconfig goes here
 #- file lib/Kconfig.kgdb goes here
+#- file lib/Kconfig.ubsan goes here
+STRICT_DEVMEM x86=y
+IO_STRICT_DEVMEM x86=y
+
+#-
+#- *** FILE: mm/Kconfig ***
+#-
+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 ***
 #-
-DIRECT_GBPAGES x86=y
+AMD_IOMMU_STATS x86_64=n
+DEBUG_STRICT_USER_COPY_CHECKS x86=n