Skip to content

Commit 5b7e41f

Browse files
H. Peter AnvinIngo Molnar
authored andcommitted
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 <[email protected]> Signed-off-by: Ingo Molnar <[email protected]>
1 parent 616ad8c commit 5b7e41f

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed

arch/x86/configs/i386_defconfig

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Automatically generated make config: don't edit
3-
# Linux kernel version: 2.6.27-rc4
4-
# Mon Aug 25 15:04:00 2008
3+
# Linux kernel version: 2.6.27-rc5
4+
# Wed Sep 3 17:23:09 2008
55
#
66
# CONFIG_64BIT is not set
77
CONFIG_X86_32=y
@@ -202,7 +202,7 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
202202
# CONFIG_M586 is not set
203203
# CONFIG_M586TSC is not set
204204
# CONFIG_M586MMX is not set
205-
# CONFIG_M686 is not set
205+
CONFIG_M686=y
206206
# CONFIG_MPENTIUMII is not set
207207
# CONFIG_MPENTIUMIII is not set
208208
# CONFIG_MPENTIUMM is not set
@@ -221,28 +221,30 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
221221
# CONFIG_MVIAC3_2 is not set
222222
# CONFIG_MVIAC7 is not set
223223
# CONFIG_MPSC is not set
224-
CONFIG_MCORE2=y
224+
# CONFIG_MCORE2 is not set
225225
# CONFIG_GENERIC_CPU is not set
226226
CONFIG_X86_GENERIC=y
227227
CONFIG_X86_CPU=y
228228
CONFIG_X86_CMPXCHG=y
229229
CONFIG_X86_L1_CACHE_SHIFT=7
230230
CONFIG_X86_XADD=y
231+
# CONFIG_X86_PPRO_FENCE is not set
231232
CONFIG_X86_WP_WORKS_OK=y
232233
CONFIG_X86_INVLPG=y
233234
CONFIG_X86_BSWAP=y
234235
CONFIG_X86_POPAD_OK=y
235236
CONFIG_X86_INTEL_USERCOPY=y
236237
CONFIG_X86_USE_PPRO_CHECKSUM=y
237238
CONFIG_X86_TSC=y
239+
CONFIG_X86_CMOV=y
238240
CONFIG_X86_MINIMUM_CPU_FAMILY=4
239241
CONFIG_X86_DEBUGCTLMSR=y
240242
CONFIG_HPET_TIMER=y
241243
CONFIG_HPET_EMULATE_RTC=y
242244
CONFIG_DMI=y
243245
# CONFIG_IOMMU_HELPER is not set
244-
CONFIG_NR_CPUS=4
245-
# CONFIG_SCHED_SMT is not set
246+
CONFIG_NR_CPUS=64
247+
CONFIG_SCHED_SMT=y
246248
CONFIG_SCHED_MC=y
247249
# CONFIG_PREEMPT_NONE is not set
248250
CONFIG_PREEMPT_VOLUNTARY=y
@@ -254,7 +256,8 @@ CONFIG_VM86=y
254256
# CONFIG_TOSHIBA is not set
255257
# CONFIG_I8K is not set
256258
CONFIG_X86_REBOOTFIXUPS=y
257-
# CONFIG_MICROCODE is not set
259+
CONFIG_MICROCODE=y
260+
CONFIG_MICROCODE_OLD_INTERFACE=y
258261
CONFIG_X86_MSR=y
259262
CONFIG_X86_CPUID=y
260263
# CONFIG_NOHIGHMEM is not set
@@ -2115,7 +2118,7 @@ CONFIG_IO_DELAY_0X80=y
21152118
CONFIG_DEFAULT_IO_DELAY_TYPE=0
21162119
CONFIG_DEBUG_BOOT_PARAMS=y
21172120
# CONFIG_CPA_DEBUG is not set
2118-
# CONFIG_OPTIMIZE_INLINING is not set
2121+
CONFIG_OPTIMIZE_INLINING=y
21192122

21202123
#
21212124
# Security options

arch/x86/configs/x86_64_defconfig

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Automatically generated make config: don't edit
3-
# Linux kernel version: 2.6.27-rc4
4-
# Mon Aug 25 14:40:46 2008
3+
# Linux kernel version: 2.6.27-rc5
4+
# Wed Sep 3 17:13:39 2008
55
#
66
CONFIG_64BIT=y
77
# CONFIG_X86_32 is not set
@@ -218,17 +218,14 @@ CONFIG_X86_PC=y
218218
# CONFIG_MVIAC3_2 is not set
219219
# CONFIG_MVIAC7 is not set
220220
# CONFIG_MPSC is not set
221-
CONFIG_MCORE2=y
222-
# CONFIG_GENERIC_CPU is not set
221+
# CONFIG_MCORE2 is not set
222+
CONFIG_GENERIC_CPU=y
223223
CONFIG_X86_CPU=y
224-
CONFIG_X86_L1_CACHE_BYTES=64
225-
CONFIG_X86_INTERNODE_CACHE_BYTES=64
224+
CONFIG_X86_L1_CACHE_BYTES=128
225+
CONFIG_X86_INTERNODE_CACHE_BYTES=128
226226
CONFIG_X86_CMPXCHG=y
227-
CONFIG_X86_L1_CACHE_SHIFT=6
227+
CONFIG_X86_L1_CACHE_SHIFT=7
228228
CONFIG_X86_WP_WORKS_OK=y
229-
CONFIG_X86_INTEL_USERCOPY=y
230-
CONFIG_X86_USE_PPRO_CHECKSUM=y
231-
CONFIG_X86_P6_NOP=y
232229
CONFIG_X86_TSC=y
233230
CONFIG_X86_CMPXCHG64=y
234231
CONFIG_X86_CMOV=y
@@ -243,9 +240,8 @@ CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
243240
CONFIG_AMD_IOMMU=y
244241
CONFIG_SWIOTLB=y
245242
CONFIG_IOMMU_HELPER=y
246-
# CONFIG_MAXSMP is not set
247-
CONFIG_NR_CPUS=4
248-
# CONFIG_SCHED_SMT is not set
243+
CONFIG_NR_CPUS=64
244+
CONFIG_SCHED_SMT=y
249245
CONFIG_SCHED_MC=y
250246
# CONFIG_PREEMPT_NONE is not set
251247
CONFIG_PREEMPT_VOLUNTARY=y
@@ -254,7 +250,8 @@ CONFIG_X86_LOCAL_APIC=y
254250
CONFIG_X86_IO_APIC=y
255251
# CONFIG_X86_MCE is not set
256252
# CONFIG_I8K is not set
257-
# CONFIG_MICROCODE is not set
253+
CONFIG_MICROCODE=y
254+
CONFIG_MICROCODE_OLD_INTERFACE=y
258255
CONFIG_X86_MSR=y
259256
CONFIG_X86_CPUID=y
260257
CONFIG_NUMA=y
@@ -290,7 +287,7 @@ CONFIG_BOUNCE=y
290287
CONFIG_VIRT_TO_BUS=y
291288
CONFIG_MTRR=y
292289
# CONFIG_MTRR_SANITIZER is not set
293-
# CONFIG_X86_PAT is not set
290+
CONFIG_X86_PAT=y
294291
CONFIG_EFI=y
295292
CONFIG_SECCOMP=y
296293
# CONFIG_HZ_100 is not set
@@ -2089,7 +2086,7 @@ CONFIG_IO_DELAY_0X80=y
20892086
CONFIG_DEFAULT_IO_DELAY_TYPE=0
20902087
CONFIG_DEBUG_BOOT_PARAMS=y
20912088
# CONFIG_CPA_DEBUG is not set
2092-
# CONFIG_OPTIMIZE_INLINING is not set
2089+
CONFIG_OPTIMIZE_INLINING=y
20932090

20942091
#
20952092
# Security options

0 commit comments

Comments
 (0)