X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=kernel-x86.config;h=e253239e6a429b13c1d650e8b100ee35a11621c1;hb=6114371a7ce8d5cf528bda7e56f0c7f9de71452a;hp=7898b0f8d1f3b75fb779c75c9c746555b97d70af;hpb=c2e5f34ddb1c2d574ff8641c1e481692ae2061df;p=packages%2Fkernel.git diff --git a/kernel-x86.config b/kernel-x86.config index 7898b0f8..e253239e 100644 --- a/kernel-x86.config +++ b/kernel-x86.config @@ -24,15 +24,12 @@ X86_NUMACHIP all=n X86_VSMP x86_64=n X86_UV i386=n x86_64=n X86_GOLDFISH all=n -X86_WANT_INTEL_MID i486=n i586=n i686=n +X86_INTEL_MID i386=n +X86_INTEL_QUARK i386=y X86_INTEL_LPSS all=y X86_RDC321X i386=n X86_32_NON_STANDARD i386=y -X86_NUMAQ i386=n -X86_VISWS i386=n STA2X11 all=y -X86_SUMMIT i386=n -X86_ES7000 i386=n X86_32_IRIS i486=y i586=y i686=y SCHED_OMIT_FRAME_POINTER i386=y x86_64=y HYPERVISOR_GUEST all=y @@ -44,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 @@ -52,7 +48,7 @@ GART_IOMMU x86_64=y CALGARY_IOMMU x86_64=y CALGARY_IOMMU_ENABLED_BY_DEFAULT x86_64=y MAXSMP i386=n x86_64=n -NR_CPUS i386=32 x86_64=1024 +NR_CPUS i386=32 x86_64=512 SCHED_SMT x86=y SCHED_MC x86=y #- file kernel/Kconfig.preempt goes here @@ -64,28 +60,28 @@ X86_MCE_INTEL all=y X86_MCE_AMD all=y X86_ANCIENT_MCE all=y X86_MCE_INJECT x86=m +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 -#- NUMA (Summit) requires SMP, 64GB highmem support, ACPI 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 @@ -96,22 +92,27 @@ 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 EFI x86=y EFI_STUB all=y SECCOMP x86=y -CC_STACKPROTECTOR x86=y x86_64=y #- file kernel/Kconfig.hz goes here 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=n +LEGACY_VSYSCALL_NONE all=y 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 @@ -147,7 +148,7 @@ RAPIDIO all=y #- file fs/Kconfig.binfmt goes here IA32_EMULATION x86_64=y IA32_AOUT x86_64=y -X86_X32 all=n +X86_X32 x86_64=y #- file net/Kconfig goes here #- file drivers/Kconfig goes here #- file drivers/firmware/Kconfig goes here @@ -203,7 +204,6 @@ STRICT_DEVMEM x86=y X86_VERBOSE_BOOTUP x86=n EARLY_PRINTK x86=y EARLY_PRINTK_DBGP x86=n -DEBUG_STACKOVERFLOW x86=n X86_PTDUMP x86=n DEBUG_RODATA all=y DEBUG_RODATA_TEST all=n @@ -260,6 +260,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 *** @@ -286,14 +287,7 @@ 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: -#- MODULbus GPIO expanders: -#- USB GPIO expanders: #- #- *** FILE: drivers/iommu/Kconfig *** @@ -310,6 +304,7 @@ STA2X11_VIP all=m #- *** FILE: drivers/media/radio/Kconfig *** #- #- file drivers/media/radio/si470x/Kconfig goes here +#- file drivers/media/radio/si4713/Kconfig goes here #- file drivers/media/radio/wl128x/Kconfig goes here V4L_RADIO_ISA_DRIVERS all=y @@ -329,9 +324,10 @@ COMEDI_AMPLC_PC263_ISA all=m COMEDI_DAS08_ISA all=m #- -#- *** FILE: drivers/usb/gadget/Kconfig *** +#- *** FILE: drivers/usb/gadget/udc/Kconfig *** #- USB_FUSB300 all=m +#- file drivers/usb/gadget/udc/bdc/Kconfig goes here #- #- *** FILE: init/Kconfig *** @@ -345,6 +341,11 @@ IRQ_TIME_ACCOUNTING x86=n #- 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,21 +354,19 @@ SPARSE_IRQ i386=y x86_64=y #- #- *** FILE: lib/Kconfig.debug *** #- +#- file mm/Kconfig.debug goes here DEBUG_STACK_USAGE x86=n 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 -#- file mm/Kconfig.debug goes here #- file kernel/trace/Kconfig goes here +MEMTEST x86=n #- file samples/Kconfig goes here #- file lib/Kconfig.kgdb goes here -#- file lib/Kconfig.kmemcheck goes here #- #- *** 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_MRST i386=y +DIRECT_GBPAGES x86=y