X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=kernel-x86.config;h=e68322ba1faf31e08e34bc84fa5613ab3ca19dc3;hb=4f339c95c04daffbf631dde7a474e1d691780558;hp=67d37a6da570e4201408ae64b43fadc1e8cd4b8c;hpb=deb22415d767dc417fc4ea9525eeed1938bfd57c;p=packages%2Fkernel.git

diff --git a/kernel-x86.config b/kernel-x86.config
index 67d37a6d..e68322ba 100644
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -7,7 +7,6 @@ OPROFILE_EVENT_MULTIPLEX x86=y
 KPROBES x86=y
 JUMP_LABEL x86=y
 OPTPROBES x86=y
-CC_STACKPROTECTOR x86=y x86_64=y
 #- file kernel/gcov/Kconfig goes here
 
 #-
@@ -25,6 +24,8 @@ X86_NUMACHIP all=n
 X86_VSMP x86_64=n
 X86_UV i386=n x86_64=n
 X86_GOLDFISH all=n
+X86_INTEL_MID all=n
+X86_INTEL_QUARK i386=y
 X86_INTEL_LPSS all=y
 X86_RDC321X i386=n
 X86_32_NON_STANDARD i386=y
@@ -40,7 +41,6 @@ KVM_GUEST x86=y
 #- file arch/x86/lguest/Kconfig goes here
 PARAVIRT_TIME_ACCOUNTING x86=y
 NO_BOOTMEM x86=y
-MEMTEST x86=n
 #- file arch/x86/Kconfig.cpu goes here
 HPET_TIMER x86=y
 DMI x86=y
@@ -60,27 +60,29 @@ 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
 TOSHIBA i386=m
 I8K x86=m
 X86_REBOOTFIXUPS i386=y
-MICROCODE x86=m
+MICROCODE all=y
 MICROCODE_INTEL x86=y
 MICROCODE_AMD x86=y
-MICROCODE_INTEL_EARLY all=y
 X86_MSR x86=m
 X86_CPUID x86=m
 NOHIGHMEM i386=n
 HIGHMEM4G i386=y
 HIGHMEM64G i386=n
 PAGE_OFFSET i386=0xC0000000
-DIRECT_GBPAGES x86=y
 NUMA x86_64=y
 AMD_NUMA x86=n
 X86_64_ACPI_NUMA x86_64=y
 NUMA_EMU x86_64=n
 NODES_SHIFT x86_64=6
 #- file mm/Kconfig goes here
+X86_PMEM_LEGACY x86=y
 HIGHPTE i386=n
 X86_CHECK_BIOS_CORRUPTION x86=y
 X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK x86=y
@@ -91,6 +93,8 @@ MTRR_SANITIZER x86=y
 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
@@ -99,13 +103,18 @@ KEXEC x86=y
 CRASH_DUMP x86=n
 KEXEC_JUMP x86=y
 PHYSICAL_START x86=0x1000000
-RELOCATABLE i386=y x86_64=n
-PHYSICAL_ALIGN i386=0x100000
+RELOCATABLE i386=y x86_64=y
+RANDOMIZE_BASE i386=y x86_64=y
+PHYSICAL_ALIGN x86=0x1000000
 HOTPLUG_CPU x86=y
 BOOTPARAM_HOTPLUG_CPU0 all=n
 DEBUG_HOTPLUG_CPU0 all=n
 COMPAT_VDSO x86=n
+LEGACY_VSYSCALL_NATIVE all=n
+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
 #- file drivers/acpi/Kconfig goes here
 #- file drivers/sfi/Kconfig goes here
@@ -123,7 +132,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
@@ -135,7 +143,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
@@ -193,15 +200,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
 DEBUG_TLBFLUSH all=n
 IOMMU_DEBUG x86_64=n
 IOMMU_STRESS x86=n
@@ -253,6 +255,7 @@ CRYPTO_SERPENT_SSE2_586 all=m
 #- Random Number Generation
 #- file drivers/crypto/Kconfig goes here
 #- file crypto/asymmetric_keys/Kconfig goes here
+#- file certs/Kconfig goes here
 
 #-
 #- *** FILE: drivers/cpufreq/Kconfig.x86 ***
@@ -276,24 +279,15 @@ X86_E_POWERSAVER i386=m
 #- shared options
 X86_SPEEDSTEP_RELAXED_CAP_CHECK i386=y
 
-#-
-#- *** FILE: drivers/gpio/Kconfig ***
-#-
-#- Memory mapped GPIO drivers:
-GPIO_STA2X11 all=y
-#- I2C GPIO expanders:
-#- PCI GPIO expanders:
-#- SPI GPIO expanders:
-#- AC97 GPIO expanders:
-#- LPC GPIO expanders:
-#- MODULbus GPIO expanders:
-#- USB GPIO expanders:
-
 #-
 #- *** FILE: drivers/iommu/Kconfig ***
 #-
 AMD_IOMMU x86_64=y
-AMD_IOMMU_STATS x86_64=n
+
+#-
+#- *** FILE: drivers/media/pci/ivtv/Kconfig ***
+#-
+VIDEO_IVTV_DEPRECATED_IOCTLS all=n
 
 #-
 #- *** FILE: drivers/media/pci/sta2x11/Kconfig ***
@@ -314,6 +308,25 @@ 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/pci/pcie/Kconfig ***
+#-
+#- file drivers/pci/pcie/aer/Kconfig goes here
+PCIEASPM_DEFAULT all=y
+PCIEASPM_POWERSAVE all=n
+PCIEASPM_POWER_SUPERSAVE all=n
+PCIEASPM_PERFORMANCE all=n
+
+#-
+#- *** FILE: drivers/platform/x86/Kconfig ***
+#-
+INTEL_TURBO_MAX_3 all=y
+
 #-
 #- *** FILE: drivers/staging/comedi/Kconfig ***
 #-
@@ -323,11 +336,6 @@ COMEDI_AMPLC_PC236_ISA all=m
 COMEDI_AMPLC_PC263_ISA all=m
 COMEDI_DAS08_ISA all=m
 
-#-
-#- *** FILE: drivers/usb/gadget/Kconfig ***
-#-
-USB_FUSB300 all=m
-
 #-
 #- *** FILE: init/Kconfig ***
 #-
@@ -335,11 +343,17 @@ USB_FUSB300 all=m
 #- file kernel/time/Kconfig goes here
 IRQ_TIME_ACCOUNTING x86=n
 #- file usr/Kconfig goes here
+PC104 all=y
 #- file arch/Kconfig goes here
 #- Do not forget to sign required modules with scripts/sign-file
 #- file block/Kconfig goes here
 #- file kernel/Kconfig.locks goes here
 
+#-
+#- *** FILE: kernel/gcov/Kconfig ***
+#-
+ARCH_HAS_GCOV_PROFILE_ALL x86=y
+
 #-
 #- *** FILE: kernel/irq/Kconfig ***
 #-
@@ -353,22 +367,25 @@ DEBUG_STACK_USAGE x86=n
 DEBUG_PER_CPU_MAPS x86=n
 DEBUG_STACKOVERFLOW x86=n
 #- file lib/Kconfig.kmemcheck goes here
-DEBUG_STRICT_USER_COPY_CHECKS x86=n
+#- file lib/Kconfig.kasan goes here
+KCOV all=n
+WW_MUTEX_SELFTEST all=m
 #- 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
 
 #-
-#- *** PROBABLY REMOVED OPTIONS ***
-#-
-EARLY_PRINTK_MRST x86=n
-KVM_CLOCK x86=y
-M386 i386=y i486=n i586=n i686=n pentium3=n pentium4=n athlon=n
-MCA i386=y
-PARAVIRT_GUEST x86=y
-X86_ES7000 i386=n
-X86_MRST i386=y
-X86_NUMAQ i386=n
-X86_SUMMIT i386=n
-X86_VISWS i386=n
-X86_WANT_INTEL_MID i486=n i586=n i686=n
+#- *** FILE: mm/Kconfig ***
+#-
+ARCH_USES_HIGH_VMA_FLAGS all=y
+ARCH_HAS_PKEYS all=y
+
+#-
+#- *** FILE: sound/x86/Kconfig ***
+#-
+SND_X86 all=y
+HDMI_LPE_AUDIO all=m