aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2006-07-10 11:06:03 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-10 18:12:32 -0400
commitd5d8ad78b05d13c658aae8f4b06b6d339f13fd58 (patch)
tree00a50ac9aa3e53e3a94cc8145321b2b832573263 /arch
parente2b209509ca33743864846aef2e1b2afc21f7915 (diff)
[PATCH] x86_64: Update defconfig
Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86_64/defconfig36
1 files changed, 31 insertions, 5 deletions
diff --git a/arch/x86_64/defconfig b/arch/x86_64/defconfig
index e69d403949c8..83d389b8ebd8 100644
--- a/arch/x86_64/defconfig
+++ b/arch/x86_64/defconfig
@@ -1,11 +1,13 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.17-git6 3# Linux kernel version: 2.6.17-git22
4# Sat Jun 24 00:52:28 2006 4# Tue Jul 4 14:24:40 2006
5# 5#
6CONFIG_X86_64=y 6CONFIG_X86_64=y
7CONFIG_64BIT=y 7CONFIG_64BIT=y
8CONFIG_X86=y 8CONFIG_X86=y
9CONFIG_LOCKDEP_SUPPORT=y
10CONFIG_STACKTRACE_SUPPORT=y
9CONFIG_SEMAPHORE_SLEEPERS=y 11CONFIG_SEMAPHORE_SLEEPERS=y
10CONFIG_MMU=y 12CONFIG_MMU=y
11CONFIG_RWSEM_GENERIC_SPINLOCK=y 13CONFIG_RWSEM_GENERIC_SPINLOCK=y
@@ -17,6 +19,7 @@ CONFIG_GENERIC_ISA_DMA=y
17CONFIG_GENERIC_IOMAP=y 19CONFIG_GENERIC_IOMAP=y
18CONFIG_ARCH_MAY_HAVE_PC_FDC=y 20CONFIG_ARCH_MAY_HAVE_PC_FDC=y
19CONFIG_DMI=y 21CONFIG_DMI=y
22CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
20 23
21# 24#
22# Code maturity level options 25# Code maturity level options
@@ -52,10 +55,12 @@ CONFIG_PRINTK=y
52CONFIG_BUG=y 55CONFIG_BUG=y
53CONFIG_ELF_CORE=y 56CONFIG_ELF_CORE=y
54CONFIG_BASE_FULL=y 57CONFIG_BASE_FULL=y
58CONFIG_RT_MUTEXES=y
55CONFIG_FUTEX=y 59CONFIG_FUTEX=y
56CONFIG_EPOLL=y 60CONFIG_EPOLL=y
57CONFIG_SHMEM=y 61CONFIG_SHMEM=y
58CONFIG_SLAB=y 62CONFIG_SLAB=y
63CONFIG_VM_EVENT_COUNTERS=y
59# CONFIG_TINY_SHMEM is not set 64# CONFIG_TINY_SHMEM is not set
60CONFIG_BASE_SMALL=0 65CONFIG_BASE_SMALL=0
61# CONFIG_SLOB is not set 66# CONFIG_SLOB is not set
@@ -136,10 +141,12 @@ CONFIG_NEED_MULTIPLE_NODES=y
136# CONFIG_SPARSEMEM_STATIC is not set 141# CONFIG_SPARSEMEM_STATIC is not set
137CONFIG_SPLIT_PTLOCK_CPUS=4 142CONFIG_SPLIT_PTLOCK_CPUS=4
138CONFIG_MIGRATION=y 143CONFIG_MIGRATION=y
144CONFIG_RESOURCES_64BIT=y
139CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y 145CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y
140CONFIG_OUT_OF_LINE_PFN_TO_PAGE=y 146CONFIG_OUT_OF_LINE_PFN_TO_PAGE=y
141CONFIG_NR_CPUS=32 147CONFIG_NR_CPUS=32
142CONFIG_HOTPLUG_CPU=y 148CONFIG_HOTPLUG_CPU=y
149CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
143CONFIG_HPET_TIMER=y 150CONFIG_HPET_TIMER=y
144CONFIG_HPET_EMULATE_RTC=y 151CONFIG_HPET_EMULATE_RTC=y
145CONFIG_IOMMU=y 152CONFIG_IOMMU=y
@@ -186,6 +193,7 @@ CONFIG_ACPI_BUTTON=y
186# CONFIG_ACPI_VIDEO is not set 193# CONFIG_ACPI_VIDEO is not set
187# CONFIG_ACPI_HOTKEY is not set 194# CONFIG_ACPI_HOTKEY is not set
188CONFIG_ACPI_FAN=y 195CONFIG_ACPI_FAN=y
196# CONFIG_ACPI_DOCK is not set
189CONFIG_ACPI_PROCESSOR=y 197CONFIG_ACPI_PROCESSOR=y
190CONFIG_ACPI_HOTPLUG_CPU=y 198CONFIG_ACPI_HOTPLUG_CPU=y
191CONFIG_ACPI_THERMAL=y 199CONFIG_ACPI_THERMAL=y
@@ -200,7 +208,7 @@ CONFIG_ACPI_POWER=y
200CONFIG_ACPI_SYSTEM=y 208CONFIG_ACPI_SYSTEM=y
201CONFIG_X86_PM_TIMER=y 209CONFIG_X86_PM_TIMER=y
202CONFIG_ACPI_CONTAINER=y 210CONFIG_ACPI_CONTAINER=y
203CONFIG_ACPI_HOTPLUG_MEMORY=y 211# CONFIG_ACPI_SBS is not set
204 212
205# 213#
206# CPU Frequency scaling 214# CPU Frequency scaling
@@ -801,6 +809,7 @@ CONFIG_SERIO_LIBPS2=y
801CONFIG_VT=y 809CONFIG_VT=y
802CONFIG_VT_CONSOLE=y 810CONFIG_VT_CONSOLE=y
803CONFIG_HW_CONSOLE=y 811CONFIG_HW_CONSOLE=y
812# CONFIG_VT_HW_CONSOLE_BINDING is not set
804# CONFIG_SERIAL_NONSTANDARD is not set 813# CONFIG_SERIAL_NONSTANDARD is not set
805 814
806# 815#
@@ -870,6 +879,9 @@ CONFIG_SOFT_WATCHDOG=y
870# 879#
871# CONFIG_USBPCWATCHDOG is not set 880# CONFIG_USBPCWATCHDOG is not set
872CONFIG_HW_RANDOM=y 881CONFIG_HW_RANDOM=y
882CONFIG_HW_RANDOM_INTEL=y
883CONFIG_HW_RANDOM_AMD=y
884# CONFIG_HW_RANDOM_GEODE is not set
873# CONFIG_NVRAM is not set 885# CONFIG_NVRAM is not set
874CONFIG_RTC=y 886CONFIG_RTC=y
875# CONFIG_DTLK is not set 887# CONFIG_DTLK is not set
@@ -886,6 +898,7 @@ CONFIG_AGP_INTEL=y
886# CONFIG_AGP_VIA is not set 898# CONFIG_AGP_VIA is not set
887# CONFIG_DRM is not set 899# CONFIG_DRM is not set
888# CONFIG_MWAVE is not set 900# CONFIG_MWAVE is not set
901# CONFIG_PC8736x_GPIO is not set
889CONFIG_RAW_DRIVER=y 902CONFIG_RAW_DRIVER=y
890CONFIG_MAX_RAW_DEVS=256 903CONFIG_MAX_RAW_DEVS=256
891CONFIG_HPET=y 904CONFIG_HPET=y
@@ -1030,8 +1043,8 @@ CONFIG_VIDEO_V4L2=y
1030# 1043#
1031# Graphics support 1044# Graphics support
1032# 1045#
1046# CONFIG_FIRMWARE_EDID is not set
1033# CONFIG_FB is not set 1047# CONFIG_FB is not set
1034CONFIG_VIDEO_SELECT=y
1035 1048
1036# 1049#
1037# Console display driver support 1050# Console display driver support
@@ -1039,6 +1052,7 @@ CONFIG_VIDEO_SELECT=y
1039CONFIG_VGA_CONSOLE=y 1052CONFIG_VGA_CONSOLE=y
1040CONFIG_VGACON_SOFT_SCROLLBACK=y 1053CONFIG_VGACON_SOFT_SCROLLBACK=y
1041CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=256 1054CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=256
1055CONFIG_VIDEO_SELECT=y
1042CONFIG_DUMMY_CONSOLE=y 1056CONFIG_DUMMY_CONSOLE=y
1043 1057
1044# 1058#
@@ -1359,6 +1373,7 @@ CONFIG_SUNRPC=y
1359# CONFIG_RPCSEC_GSS_SPKM3 is not set 1373# CONFIG_RPCSEC_GSS_SPKM3 is not set
1360# CONFIG_SMB_FS is not set 1374# CONFIG_SMB_FS is not set
1361# CONFIG_CIFS is not set 1375# CONFIG_CIFS is not set
1376# CONFIG_CIFS_DEBUG2 is not set
1362# CONFIG_NCP_FS is not set 1377# CONFIG_NCP_FS is not set
1363# CONFIG_CODA_FS is not set 1378# CONFIG_CODA_FS is not set
1364# CONFIG_AFS_FS is not set 1379# CONFIG_AFS_FS is not set
@@ -1424,16 +1439,24 @@ CONFIG_KPROBES=y
1424# 1439#
1425# Kernel hacking 1440# Kernel hacking
1426# 1441#
1442CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1427# CONFIG_PRINTK_TIME is not set 1443# CONFIG_PRINTK_TIME is not set
1428CONFIG_MAGIC_SYSRQ=y 1444CONFIG_MAGIC_SYSRQ=y
1445CONFIG_UNUSED_SYMBOLS=y
1429CONFIG_DEBUG_KERNEL=y 1446CONFIG_DEBUG_KERNEL=y
1430CONFIG_LOG_BUF_SHIFT=18 1447CONFIG_LOG_BUF_SHIFT=18
1431CONFIG_DETECT_SOFTLOCKUP=y 1448CONFIG_DETECT_SOFTLOCKUP=y
1432# CONFIG_SCHEDSTATS is not set 1449# CONFIG_SCHEDSTATS is not set
1433# CONFIG_DEBUG_SLAB is not set 1450# CONFIG_DEBUG_SLAB is not set
1434# CONFIG_DEBUG_MUTEXES is not set 1451# CONFIG_DEBUG_RT_MUTEXES is not set
1452# CONFIG_RT_MUTEX_TESTER is not set
1435# CONFIG_DEBUG_SPINLOCK is not set 1453# CONFIG_DEBUG_SPINLOCK is not set
1454# CONFIG_DEBUG_MUTEXES is not set
1455# CONFIG_DEBUG_RWSEMS is not set
1456# CONFIG_DEBUG_LOCK_ALLOC is not set
1457# CONFIG_PROVE_LOCKING is not set
1436# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1458# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1459# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1437# CONFIG_DEBUG_KOBJECT is not set 1460# CONFIG_DEBUG_KOBJECT is not set
1438# CONFIG_DEBUG_INFO is not set 1461# CONFIG_DEBUG_INFO is not set
1439CONFIG_DEBUG_FS=y 1462CONFIG_DEBUG_FS=y
@@ -1445,6 +1468,8 @@ CONFIG_STACK_UNWIND=y
1445# CONFIG_RCU_TORTURE_TEST is not set 1468# CONFIG_RCU_TORTURE_TEST is not set
1446# CONFIG_DEBUG_RODATA is not set 1469# CONFIG_DEBUG_RODATA is not set
1447# CONFIG_IOMMU_DEBUG is not set 1470# CONFIG_IOMMU_DEBUG is not set
1471CONFIG_DEBUG_STACKOVERFLOW=y
1472# CONFIG_DEBUG_STACK_USAGE is not set
1448 1473
1449# 1474#
1450# Security options 1475# Security options
@@ -1468,3 +1493,4 @@ CONFIG_STACK_UNWIND=y
1468# CONFIG_CRC16 is not set 1493# CONFIG_CRC16 is not set
1469CONFIG_CRC32=y 1494CONFIG_CRC32=y
1470# CONFIG_LIBCRC32C is not set 1495# CONFIG_LIBCRC32C is not set
1496CONFIG_PLIST=y