- new location of g_midi module

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

diff --git a/kernel-x86.config b/kernel-x86.config
index 88f725a7c0ad29ae96cf35ee1db4001b1987c10f..00e650a041a5bcdbc1644352e66c62a581ce0c31 100644 (file)
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -7,6 +7,7 @@ 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
 
 #-
@@ -23,25 +24,22 @@ 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_WANT_INTEL_MID i486=n i586=n i686=n
+X86_GOLDFISH all=n
+X86_INTEL_MID i386=n
 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
-PARAVIRT_GUEST x86=y
-PARAVIRT_TIME_ACCOUNTING x86=y
+HYPERVISOR_GUEST all=y
+PARAVIRT x86=y
+PARAVIRT_DEBUG x86=n
+PARAVIRT_SPINLOCKS x86=n
 #- file arch/x86/xen/Kconfig goes here
 KVM_GUEST x86=y
 #- file arch/x86/lguest/Kconfig goes here
-PARAVIRT x86=y
-PARAVIRT_SPINLOCKS x86=n
-PARAVIRT_DEBUG x86=n
+PARAVIRT_TIME_ACCOUNTING x86=y
 NO_BOOTMEM x86=y
 MEMTEST x86=n
 #- file arch/x86/Kconfig.cpu goes here
@@ -51,7 +49,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 x86=32
+NR_CPUS i386=32 x86_64=512
 SCHED_SMT x86=y
 SCHED_MC x86=y
 #- file kernel/Kconfig.preempt goes here
@@ -70,7 +68,6 @@ X86_REBOOTFIXUPS i386=y
 MICROCODE x86=m
 MICROCODE_INTEL x86=y
 MICROCODE_AMD x86=y
-MICROCODE_INTEL_EARLY all=y
 X86_MSR x86=m
 X86_CPUID x86=m
 NOHIGHMEM i386=n
@@ -79,7 +76,6 @@ 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
@@ -98,13 +94,13 @@ X86_PAT 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
+RELOCATABLE i386=y x86_64=y
+RANDOMIZE_BASE i386=y x86_64=y
 PHYSICAL_ALIGN i386=0x100000
 HOTPLUG_CPU x86=y
 BOOTPARAM_HOTPLUG_CPU0 all=n
@@ -146,7 +142,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
@@ -202,7 +198,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
@@ -219,7 +214,6 @@ IO_DELAY_NONE x86=n
 DEBUG_BOOT_PARAMS x86=n
 CPA_DEBUG x86=n
 OPTIMIZE_INLINING x86=n
-DEBUG_STRICT_USER_COPY_CHECKS x86=n
 DEBUG_NMI_SELFTEST all=y
 
 #-
@@ -292,6 +286,7 @@ GPIO_STA2X11 all=y
 #- PCI GPIO expanders:
 #- SPI GPIO expanders:
 #- AC97 GPIO expanders:
+#- LPC GPIO expanders:
 #- MODULbus GPIO expanders:
 #- USB GPIO expanders:
 
@@ -310,6 +305,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
 
@@ -353,19 +349,12 @@ 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
-#- file mm/Kconfig.debug goes here
+DEBUG_STACKOVERFLOW x86=n
+#- file lib/Kconfig.kmemcheck goes here
+DEBUG_STRICT_USER_COPY_CHECKS x86=n
 #- file kernel/trace/Kconfig goes here
 #- 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
-X86_MRST i386=y