x86: additional defconfig updates
Additional updates to the x86 defconfigs. The goals are, as before: - Make them usable to testers, more so than distributors or end users, both of which are likely to have their own config already. - Keep 32 and 64 bits as similar as is practical. Changes: - Use a more generic CPU type (ppro and generic, respectively). - Bump number of CPUs to 64 (few if any NR_CPUS arrays left). - Enable PAT. - Enable OPTIMIZE_INLINE. - Enable microcode update support. - Build SMT scheduler support (in addition to MC). Signed-off-by: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
parent
616ad8c442
commit
5b7e41ff37
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# Automatically generated make config: don't edit
|
# Automatically generated make config: don't edit
|
||||||
# Linux kernel version: 2.6.27-rc4
|
# Linux kernel version: 2.6.27-rc5
|
||||||
# Mon Aug 25 15:04:00 2008
|
# Wed Sep 3 17:23:09 2008
|
||||||
#
|
#
|
||||||
# CONFIG_64BIT is not set
|
# CONFIG_64BIT is not set
|
||||||
CONFIG_X86_32=y
|
CONFIG_X86_32=y
|
||||||
@ -202,7 +202,7 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
|
|||||||
# CONFIG_M586 is not set
|
# CONFIG_M586 is not set
|
||||||
# CONFIG_M586TSC is not set
|
# CONFIG_M586TSC is not set
|
||||||
# CONFIG_M586MMX is not set
|
# CONFIG_M586MMX is not set
|
||||||
# CONFIG_M686 is not set
|
CONFIG_M686=y
|
||||||
# CONFIG_MPENTIUMII is not set
|
# CONFIG_MPENTIUMII is not set
|
||||||
# CONFIG_MPENTIUMIII is not set
|
# CONFIG_MPENTIUMIII is not set
|
||||||
# CONFIG_MPENTIUMM is not set
|
# CONFIG_MPENTIUMM is not set
|
||||||
@ -221,13 +221,14 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
|
|||||||
# CONFIG_MVIAC3_2 is not set
|
# CONFIG_MVIAC3_2 is not set
|
||||||
# CONFIG_MVIAC7 is not set
|
# CONFIG_MVIAC7 is not set
|
||||||
# CONFIG_MPSC is not set
|
# CONFIG_MPSC is not set
|
||||||
CONFIG_MCORE2=y
|
# CONFIG_MCORE2 is not set
|
||||||
# CONFIG_GENERIC_CPU is not set
|
# CONFIG_GENERIC_CPU is not set
|
||||||
CONFIG_X86_GENERIC=y
|
CONFIG_X86_GENERIC=y
|
||||||
CONFIG_X86_CPU=y
|
CONFIG_X86_CPU=y
|
||||||
CONFIG_X86_CMPXCHG=y
|
CONFIG_X86_CMPXCHG=y
|
||||||
CONFIG_X86_L1_CACHE_SHIFT=7
|
CONFIG_X86_L1_CACHE_SHIFT=7
|
||||||
CONFIG_X86_XADD=y
|
CONFIG_X86_XADD=y
|
||||||
|
# CONFIG_X86_PPRO_FENCE is not set
|
||||||
CONFIG_X86_WP_WORKS_OK=y
|
CONFIG_X86_WP_WORKS_OK=y
|
||||||
CONFIG_X86_INVLPG=y
|
CONFIG_X86_INVLPG=y
|
||||||
CONFIG_X86_BSWAP=y
|
CONFIG_X86_BSWAP=y
|
||||||
@ -235,14 +236,15 @@ CONFIG_X86_POPAD_OK=y
|
|||||||
CONFIG_X86_INTEL_USERCOPY=y
|
CONFIG_X86_INTEL_USERCOPY=y
|
||||||
CONFIG_X86_USE_PPRO_CHECKSUM=y
|
CONFIG_X86_USE_PPRO_CHECKSUM=y
|
||||||
CONFIG_X86_TSC=y
|
CONFIG_X86_TSC=y
|
||||||
|
CONFIG_X86_CMOV=y
|
||||||
CONFIG_X86_MINIMUM_CPU_FAMILY=4
|
CONFIG_X86_MINIMUM_CPU_FAMILY=4
|
||||||
CONFIG_X86_DEBUGCTLMSR=y
|
CONFIG_X86_DEBUGCTLMSR=y
|
||||||
CONFIG_HPET_TIMER=y
|
CONFIG_HPET_TIMER=y
|
||||||
CONFIG_HPET_EMULATE_RTC=y
|
CONFIG_HPET_EMULATE_RTC=y
|
||||||
CONFIG_DMI=y
|
CONFIG_DMI=y
|
||||||
# CONFIG_IOMMU_HELPER is not set
|
# CONFIG_IOMMU_HELPER is not set
|
||||||
CONFIG_NR_CPUS=4
|
CONFIG_NR_CPUS=64
|
||||||
# CONFIG_SCHED_SMT is not set
|
CONFIG_SCHED_SMT=y
|
||||||
CONFIG_SCHED_MC=y
|
CONFIG_SCHED_MC=y
|
||||||
# CONFIG_PREEMPT_NONE is not set
|
# CONFIG_PREEMPT_NONE is not set
|
||||||
CONFIG_PREEMPT_VOLUNTARY=y
|
CONFIG_PREEMPT_VOLUNTARY=y
|
||||||
@ -254,7 +256,8 @@ CONFIG_VM86=y
|
|||||||
# CONFIG_TOSHIBA is not set
|
# CONFIG_TOSHIBA is not set
|
||||||
# CONFIG_I8K is not set
|
# CONFIG_I8K is not set
|
||||||
CONFIG_X86_REBOOTFIXUPS=y
|
CONFIG_X86_REBOOTFIXUPS=y
|
||||||
# CONFIG_MICROCODE is not set
|
CONFIG_MICROCODE=y
|
||||||
|
CONFIG_MICROCODE_OLD_INTERFACE=y
|
||||||
CONFIG_X86_MSR=y
|
CONFIG_X86_MSR=y
|
||||||
CONFIG_X86_CPUID=y
|
CONFIG_X86_CPUID=y
|
||||||
# CONFIG_NOHIGHMEM is not set
|
# CONFIG_NOHIGHMEM is not set
|
||||||
@ -2115,7 +2118,7 @@ CONFIG_IO_DELAY_0X80=y
|
|||||||
CONFIG_DEFAULT_IO_DELAY_TYPE=0
|
CONFIG_DEFAULT_IO_DELAY_TYPE=0
|
||||||
CONFIG_DEBUG_BOOT_PARAMS=y
|
CONFIG_DEBUG_BOOT_PARAMS=y
|
||||||
# CONFIG_CPA_DEBUG is not set
|
# CONFIG_CPA_DEBUG is not set
|
||||||
# CONFIG_OPTIMIZE_INLINING is not set
|
CONFIG_OPTIMIZE_INLINING=y
|
||||||
|
|
||||||
#
|
#
|
||||||
# Security options
|
# Security options
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# Automatically generated make config: don't edit
|
# Automatically generated make config: don't edit
|
||||||
# Linux kernel version: 2.6.27-rc4
|
# Linux kernel version: 2.6.27-rc5
|
||||||
# Mon Aug 25 14:40:46 2008
|
# Wed Sep 3 17:13:39 2008
|
||||||
#
|
#
|
||||||
CONFIG_64BIT=y
|
CONFIG_64BIT=y
|
||||||
# CONFIG_X86_32 is not set
|
# CONFIG_X86_32 is not set
|
||||||
@ -218,17 +218,14 @@ CONFIG_X86_PC=y
|
|||||||
# CONFIG_MVIAC3_2 is not set
|
# CONFIG_MVIAC3_2 is not set
|
||||||
# CONFIG_MVIAC7 is not set
|
# CONFIG_MVIAC7 is not set
|
||||||
# CONFIG_MPSC is not set
|
# CONFIG_MPSC is not set
|
||||||
CONFIG_MCORE2=y
|
# CONFIG_MCORE2 is not set
|
||||||
# CONFIG_GENERIC_CPU is not set
|
CONFIG_GENERIC_CPU=y
|
||||||
CONFIG_X86_CPU=y
|
CONFIG_X86_CPU=y
|
||||||
CONFIG_X86_L1_CACHE_BYTES=64
|
CONFIG_X86_L1_CACHE_BYTES=128
|
||||||
CONFIG_X86_INTERNODE_CACHE_BYTES=64
|
CONFIG_X86_INTERNODE_CACHE_BYTES=128
|
||||||
CONFIG_X86_CMPXCHG=y
|
CONFIG_X86_CMPXCHG=y
|
||||||
CONFIG_X86_L1_CACHE_SHIFT=6
|
CONFIG_X86_L1_CACHE_SHIFT=7
|
||||||
CONFIG_X86_WP_WORKS_OK=y
|
CONFIG_X86_WP_WORKS_OK=y
|
||||||
CONFIG_X86_INTEL_USERCOPY=y
|
|
||||||
CONFIG_X86_USE_PPRO_CHECKSUM=y
|
|
||||||
CONFIG_X86_P6_NOP=y
|
|
||||||
CONFIG_X86_TSC=y
|
CONFIG_X86_TSC=y
|
||||||
CONFIG_X86_CMPXCHG64=y
|
CONFIG_X86_CMPXCHG64=y
|
||||||
CONFIG_X86_CMOV=y
|
CONFIG_X86_CMOV=y
|
||||||
@ -243,9 +240,8 @@ CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
|
|||||||
CONFIG_AMD_IOMMU=y
|
CONFIG_AMD_IOMMU=y
|
||||||
CONFIG_SWIOTLB=y
|
CONFIG_SWIOTLB=y
|
||||||
CONFIG_IOMMU_HELPER=y
|
CONFIG_IOMMU_HELPER=y
|
||||||
# CONFIG_MAXSMP is not set
|
CONFIG_NR_CPUS=64
|
||||||
CONFIG_NR_CPUS=4
|
CONFIG_SCHED_SMT=y
|
||||||
# CONFIG_SCHED_SMT is not set
|
|
||||||
CONFIG_SCHED_MC=y
|
CONFIG_SCHED_MC=y
|
||||||
# CONFIG_PREEMPT_NONE is not set
|
# CONFIG_PREEMPT_NONE is not set
|
||||||
CONFIG_PREEMPT_VOLUNTARY=y
|
CONFIG_PREEMPT_VOLUNTARY=y
|
||||||
@ -254,7 +250,8 @@ CONFIG_X86_LOCAL_APIC=y
|
|||||||
CONFIG_X86_IO_APIC=y
|
CONFIG_X86_IO_APIC=y
|
||||||
# CONFIG_X86_MCE is not set
|
# CONFIG_X86_MCE is not set
|
||||||
# CONFIG_I8K is not set
|
# CONFIG_I8K is not set
|
||||||
# CONFIG_MICROCODE is not set
|
CONFIG_MICROCODE=y
|
||||||
|
CONFIG_MICROCODE_OLD_INTERFACE=y
|
||||||
CONFIG_X86_MSR=y
|
CONFIG_X86_MSR=y
|
||||||
CONFIG_X86_CPUID=y
|
CONFIG_X86_CPUID=y
|
||||||
CONFIG_NUMA=y
|
CONFIG_NUMA=y
|
||||||
@ -290,7 +287,7 @@ CONFIG_BOUNCE=y
|
|||||||
CONFIG_VIRT_TO_BUS=y
|
CONFIG_VIRT_TO_BUS=y
|
||||||
CONFIG_MTRR=y
|
CONFIG_MTRR=y
|
||||||
# CONFIG_MTRR_SANITIZER is not set
|
# CONFIG_MTRR_SANITIZER is not set
|
||||||
# CONFIG_X86_PAT is not set
|
CONFIG_X86_PAT=y
|
||||||
CONFIG_EFI=y
|
CONFIG_EFI=y
|
||||||
CONFIG_SECCOMP=y
|
CONFIG_SECCOMP=y
|
||||||
# CONFIG_HZ_100 is not set
|
# CONFIG_HZ_100 is not set
|
||||||
@ -2089,7 +2086,7 @@ CONFIG_IO_DELAY_0X80=y
|
|||||||
CONFIG_DEFAULT_IO_DELAY_TYPE=0
|
CONFIG_DEFAULT_IO_DELAY_TYPE=0
|
||||||
CONFIG_DEBUG_BOOT_PARAMS=y
|
CONFIG_DEBUG_BOOT_PARAMS=y
|
||||||
# CONFIG_CPA_DEBUG is not set
|
# CONFIG_CPA_DEBUG is not set
|
||||||
# CONFIG_OPTIMIZE_INLINING is not set
|
CONFIG_OPTIMIZE_INLINING=y
|
||||||
|
|
||||||
#
|
#
|
||||||
# Security options
|
# Security options
|
||||||
|
Loading…
Reference in New Issue
Block a user