aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/configs
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/configs')
-rw-r--r--arch/x86/configs/i386_defconfig22
-rw-r--r--arch/x86/configs/x86_64_defconfig31
2 files changed, 24 insertions, 29 deletions
diff --git a/arch/x86/configs/i386_defconfig b/arch/x86/configs/i386_defconfig
index 104275e191a8..13b8c86ae985 100644
--- a/arch/x86/configs/i386_defconfig
+++ b/arch/x86/configs/i386_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.27-rc4 3# Linux kernel version: 2.6.27-rc5
4# Mon Aug 25 15:04:00 2008 4# Wed Sep 3 17:23:09 2008
5# 5#
6# CONFIG_64BIT is not set 6# CONFIG_64BIT is not set
7CONFIG_X86_32=y 7CONFIG_X86_32=y
@@ -202,7 +202,7 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
202# CONFIG_M586 is not set 202# CONFIG_M586 is not set
203# CONFIG_M586TSC is not set 203# CONFIG_M586TSC is not set
204# CONFIG_M586MMX is not set 204# CONFIG_M586MMX is not set
205# CONFIG_M686 is not set 205CONFIG_M686=y
206# CONFIG_MPENTIUMII is not set 206# CONFIG_MPENTIUMII is not set
207# CONFIG_MPENTIUMIII is not set 207# CONFIG_MPENTIUMIII is not set
208# CONFIG_MPENTIUMM is not set 208# CONFIG_MPENTIUMM is not set
@@ -213,7 +213,6 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
213# CONFIG_MCRUSOE is not set 213# CONFIG_MCRUSOE is not set
214# CONFIG_MEFFICEON is not set 214# CONFIG_MEFFICEON is not set
215# CONFIG_MWINCHIPC6 is not set 215# CONFIG_MWINCHIPC6 is not set
216# CONFIG_MWINCHIP2 is not set
217# CONFIG_MWINCHIP3D is not set 216# CONFIG_MWINCHIP3D is not set
218# CONFIG_MGEODEGX1 is not set 217# CONFIG_MGEODEGX1 is not set
219# CONFIG_MGEODE_LX is not set 218# CONFIG_MGEODE_LX is not set
@@ -221,13 +220,14 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
221# CONFIG_MVIAC3_2 is not set 220# CONFIG_MVIAC3_2 is not set
222# CONFIG_MVIAC7 is not set 221# CONFIG_MVIAC7 is not set
223# CONFIG_MPSC is not set 222# CONFIG_MPSC is not set
224CONFIG_MCORE2=y 223# CONFIG_MCORE2 is not set
225# CONFIG_GENERIC_CPU is not set 224# CONFIG_GENERIC_CPU is not set
226CONFIG_X86_GENERIC=y 225CONFIG_X86_GENERIC=y
227CONFIG_X86_CPU=y 226CONFIG_X86_CPU=y
228CONFIG_X86_CMPXCHG=y 227CONFIG_X86_CMPXCHG=y
229CONFIG_X86_L1_CACHE_SHIFT=7 228CONFIG_X86_L1_CACHE_SHIFT=7
230CONFIG_X86_XADD=y 229CONFIG_X86_XADD=y
230# CONFIG_X86_PPRO_FENCE is not set
231CONFIG_X86_WP_WORKS_OK=y 231CONFIG_X86_WP_WORKS_OK=y
232CONFIG_X86_INVLPG=y 232CONFIG_X86_INVLPG=y
233CONFIG_X86_BSWAP=y 233CONFIG_X86_BSWAP=y
@@ -235,14 +235,15 @@ CONFIG_X86_POPAD_OK=y
235CONFIG_X86_INTEL_USERCOPY=y 235CONFIG_X86_INTEL_USERCOPY=y
236CONFIG_X86_USE_PPRO_CHECKSUM=y 236CONFIG_X86_USE_PPRO_CHECKSUM=y
237CONFIG_X86_TSC=y 237CONFIG_X86_TSC=y
238CONFIG_X86_CMOV=y
238CONFIG_X86_MINIMUM_CPU_FAMILY=4 239CONFIG_X86_MINIMUM_CPU_FAMILY=4
239CONFIG_X86_DEBUGCTLMSR=y 240CONFIG_X86_DEBUGCTLMSR=y
240CONFIG_HPET_TIMER=y 241CONFIG_HPET_TIMER=y
241CONFIG_HPET_EMULATE_RTC=y 242CONFIG_HPET_EMULATE_RTC=y
242CONFIG_DMI=y 243CONFIG_DMI=y
243# CONFIG_IOMMU_HELPER is not set 244# CONFIG_IOMMU_HELPER is not set
244CONFIG_NR_CPUS=4 245CONFIG_NR_CPUS=64
245# CONFIG_SCHED_SMT is not set 246CONFIG_SCHED_SMT=y
246CONFIG_SCHED_MC=y 247CONFIG_SCHED_MC=y
247# CONFIG_PREEMPT_NONE is not set 248# CONFIG_PREEMPT_NONE is not set
248CONFIG_PREEMPT_VOLUNTARY=y 249CONFIG_PREEMPT_VOLUNTARY=y
@@ -254,7 +255,8 @@ CONFIG_VM86=y
254# CONFIG_TOSHIBA is not set 255# CONFIG_TOSHIBA is not set
255# CONFIG_I8K is not set 256# CONFIG_I8K is not set
256CONFIG_X86_REBOOTFIXUPS=y 257CONFIG_X86_REBOOTFIXUPS=y
257# CONFIG_MICROCODE is not set 258CONFIG_MICROCODE=y
259CONFIG_MICROCODE_OLD_INTERFACE=y
258CONFIG_X86_MSR=y 260CONFIG_X86_MSR=y
259CONFIG_X86_CPUID=y 261CONFIG_X86_CPUID=y
260# CONFIG_NOHIGHMEM is not set 262# CONFIG_NOHIGHMEM is not set
@@ -285,7 +287,6 @@ CONFIG_MTRR=y
285# CONFIG_MTRR_SANITIZER is not set 287# CONFIG_MTRR_SANITIZER is not set
286CONFIG_X86_PAT=y 288CONFIG_X86_PAT=y
287CONFIG_EFI=y 289CONFIG_EFI=y
288# CONFIG_IRQBALANCE is not set
289CONFIG_SECCOMP=y 290CONFIG_SECCOMP=y
290# CONFIG_HZ_100 is not set 291# CONFIG_HZ_100 is not set
291# CONFIG_HZ_250 is not set 292# CONFIG_HZ_250 is not set
@@ -1532,7 +1533,6 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
1532CONFIG_VGA_CONSOLE=y 1533CONFIG_VGA_CONSOLE=y
1533CONFIG_VGACON_SOFT_SCROLLBACK=y 1534CONFIG_VGACON_SOFT_SCROLLBACK=y
1534CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 1535CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
1535CONFIG_VIDEO_SELECT=y
1536CONFIG_DUMMY_CONSOLE=y 1536CONFIG_DUMMY_CONSOLE=y
1537# CONFIG_FRAMEBUFFER_CONSOLE is not set 1537# CONFIG_FRAMEBUFFER_CONSOLE is not set
1538CONFIG_LOGO=y 1538CONFIG_LOGO=y
@@ -2115,7 +2115,7 @@ CONFIG_IO_DELAY_0X80=y
2115CONFIG_DEFAULT_IO_DELAY_TYPE=0 2115CONFIG_DEFAULT_IO_DELAY_TYPE=0
2116CONFIG_DEBUG_BOOT_PARAMS=y 2116CONFIG_DEBUG_BOOT_PARAMS=y
2117# CONFIG_CPA_DEBUG is not set 2117# CONFIG_CPA_DEBUG is not set
2118# CONFIG_OPTIMIZE_INLINING is not set 2118CONFIG_OPTIMIZE_INLINING=y
2119 2119
2120# 2120#
2121# Security options 2121# Security options
diff --git a/arch/x86/configs/x86_64_defconfig b/arch/x86/configs/x86_64_defconfig
index 678c8acefe04..f0a03d7a7d63 100644
--- a/arch/x86/configs/x86_64_defconfig
+++ b/arch/x86/configs/x86_64_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.27-rc4 3# Linux kernel version: 2.6.27-rc5
4# Mon Aug 25 14:40:46 2008 4# Wed Sep 3 17:13:39 2008
5# 5#
6CONFIG_64BIT=y 6CONFIG_64BIT=y
7# CONFIG_X86_32 is not set 7# CONFIG_X86_32 is not set
@@ -210,7 +210,6 @@ CONFIG_X86_PC=y
210# CONFIG_MCRUSOE is not set 210# CONFIG_MCRUSOE is not set
211# CONFIG_MEFFICEON is not set 211# CONFIG_MEFFICEON is not set
212# CONFIG_MWINCHIPC6 is not set 212# CONFIG_MWINCHIPC6 is not set
213# CONFIG_MWINCHIP2 is not set
214# CONFIG_MWINCHIP3D is not set 213# CONFIG_MWINCHIP3D is not set
215# CONFIG_MGEODEGX1 is not set 214# CONFIG_MGEODEGX1 is not set
216# CONFIG_MGEODE_LX is not set 215# CONFIG_MGEODE_LX is not set
@@ -218,17 +217,14 @@ CONFIG_X86_PC=y
218# CONFIG_MVIAC3_2 is not set 217# CONFIG_MVIAC3_2 is not set
219# CONFIG_MVIAC7 is not set 218# CONFIG_MVIAC7 is not set
220# CONFIG_MPSC is not set 219# CONFIG_MPSC is not set
221CONFIG_MCORE2=y 220# CONFIG_MCORE2 is not set
222# CONFIG_GENERIC_CPU is not set 221CONFIG_GENERIC_CPU=y
223CONFIG_X86_CPU=y 222CONFIG_X86_CPU=y
224CONFIG_X86_L1_CACHE_BYTES=64 223CONFIG_X86_L1_CACHE_BYTES=128
225CONFIG_X86_INTERNODE_CACHE_BYTES=64 224CONFIG_X86_INTERNODE_CACHE_BYTES=128
226CONFIG_X86_CMPXCHG=y 225CONFIG_X86_CMPXCHG=y
227CONFIG_X86_L1_CACHE_SHIFT=6 226CONFIG_X86_L1_CACHE_SHIFT=7
228CONFIG_X86_WP_WORKS_OK=y 227CONFIG_X86_WP_WORKS_OK=y
229CONFIG_X86_INTEL_USERCOPY=y
230CONFIG_X86_USE_PPRO_CHECKSUM=y
231CONFIG_X86_P6_NOP=y
232CONFIG_X86_TSC=y 228CONFIG_X86_TSC=y
233CONFIG_X86_CMPXCHG64=y 229CONFIG_X86_CMPXCHG64=y
234CONFIG_X86_CMOV=y 230CONFIG_X86_CMOV=y
@@ -243,9 +239,8 @@ CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
243CONFIG_AMD_IOMMU=y 239CONFIG_AMD_IOMMU=y
244CONFIG_SWIOTLB=y 240CONFIG_SWIOTLB=y
245CONFIG_IOMMU_HELPER=y 241CONFIG_IOMMU_HELPER=y
246# CONFIG_MAXSMP is not set 242CONFIG_NR_CPUS=64
247CONFIG_NR_CPUS=4 243CONFIG_SCHED_SMT=y
248# CONFIG_SCHED_SMT is not set
249CONFIG_SCHED_MC=y 244CONFIG_SCHED_MC=y
250# CONFIG_PREEMPT_NONE is not set 245# CONFIG_PREEMPT_NONE is not set
251CONFIG_PREEMPT_VOLUNTARY=y 246CONFIG_PREEMPT_VOLUNTARY=y
@@ -254,7 +249,8 @@ CONFIG_X86_LOCAL_APIC=y
254CONFIG_X86_IO_APIC=y 249CONFIG_X86_IO_APIC=y
255# CONFIG_X86_MCE is not set 250# CONFIG_X86_MCE is not set
256# CONFIG_I8K is not set 251# CONFIG_I8K is not set
257# CONFIG_MICROCODE is not set 252CONFIG_MICROCODE=y
253CONFIG_MICROCODE_OLD_INTERFACE=y
258CONFIG_X86_MSR=y 254CONFIG_X86_MSR=y
259CONFIG_X86_CPUID=y 255CONFIG_X86_CPUID=y
260CONFIG_NUMA=y 256CONFIG_NUMA=y
@@ -290,7 +286,7 @@ CONFIG_BOUNCE=y
290CONFIG_VIRT_TO_BUS=y 286CONFIG_VIRT_TO_BUS=y
291CONFIG_MTRR=y 287CONFIG_MTRR=y
292# CONFIG_MTRR_SANITIZER is not set 288# CONFIG_MTRR_SANITIZER is not set
293# CONFIG_X86_PAT is not set 289CONFIG_X86_PAT=y
294CONFIG_EFI=y 290CONFIG_EFI=y
295CONFIG_SECCOMP=y 291CONFIG_SECCOMP=y
296# CONFIG_HZ_100 is not set 292# CONFIG_HZ_100 is not set
@@ -1508,7 +1504,6 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
1508CONFIG_VGA_CONSOLE=y 1504CONFIG_VGA_CONSOLE=y
1509CONFIG_VGACON_SOFT_SCROLLBACK=y 1505CONFIG_VGACON_SOFT_SCROLLBACK=y
1510CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 1506CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
1511CONFIG_VIDEO_SELECT=y
1512CONFIG_DUMMY_CONSOLE=y 1507CONFIG_DUMMY_CONSOLE=y
1513# CONFIG_FRAMEBUFFER_CONSOLE is not set 1508# CONFIG_FRAMEBUFFER_CONSOLE is not set
1514CONFIG_LOGO=y 1509CONFIG_LOGO=y
@@ -2089,7 +2084,7 @@ CONFIG_IO_DELAY_0X80=y
2089CONFIG_DEFAULT_IO_DELAY_TYPE=0 2084CONFIG_DEFAULT_IO_DELAY_TYPE=0
2090CONFIG_DEBUG_BOOT_PARAMS=y 2085CONFIG_DEBUG_BOOT_PARAMS=y
2091# CONFIG_CPA_DEBUG is not set 2086# CONFIG_CPA_DEBUG is not set
2092# CONFIG_OPTIMIZE_INLINING is not set 2087CONFIG_OPTIMIZE_INLINING=y
2093 2088
2094# 2089#
2095# Security options 2090# Security options
generated by cgit v1.2.2 (git 2.25.0) at 2025-02-22 00:01:06 -0500