aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86_64
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2006-04-07 13:49:09 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-09 14:53:16 -0400
commit903fcc608e9f531749024172277dc2fd15d5a587 (patch)
tree6844416b377a7f4f7aaf29eb53ed140afa47699e /arch/x86_64
parent6246b6128bbe34d0752f119cf7c5111c85fe481d (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/x86_64')
-rw-r--r--arch/x86_64/defconfig42
1 files changed, 24 insertions, 18 deletions
diff --git a/arch/x86_64/defconfig b/arch/x86_64/defconfig
index 566ecc97ee5a..3c45ec22b3fe 100644
--- a/arch/x86_64/defconfig
+++ b/arch/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.16-git9 3# Linux kernel version: 2.6.17-rc1
4# Sat Mar 25 15:18:40 2006 4# Mon Apr 3 16:11:14 2006
5# 5#
6CONFIG_X86_64=y 6CONFIG_X86_64=y
7CONFIG_64BIT=y 7CONFIG_64BIT=y
@@ -9,6 +9,7 @@ CONFIG_X86=y
9CONFIG_SEMAPHORE_SLEEPERS=y 9CONFIG_SEMAPHORE_SLEEPERS=y
10CONFIG_MMU=y 10CONFIG_MMU=y
11CONFIG_RWSEM_GENERIC_SPINLOCK=y 11CONFIG_RWSEM_GENERIC_SPINLOCK=y
12CONFIG_GENERIC_HWEIGHT=y
12CONFIG_GENERIC_CALIBRATE_DELAY=y 13CONFIG_GENERIC_CALIBRATE_DELAY=y
13CONFIG_X86_CMPXCHG=y 14CONFIG_X86_CMPXCHG=y
14CONFIG_EARLY_PRINTK=y 15CONFIG_EARLY_PRINTK=y
@@ -55,10 +56,6 @@ CONFIG_BASE_FULL=y
55CONFIG_FUTEX=y 56CONFIG_FUTEX=y
56CONFIG_EPOLL=y 57CONFIG_EPOLL=y
57CONFIG_SHMEM=y 58CONFIG_SHMEM=y
58CONFIG_CC_ALIGN_FUNCTIONS=0
59CONFIG_CC_ALIGN_LABELS=0
60CONFIG_CC_ALIGN_LOOPS=0
61CONFIG_CC_ALIGN_JUMPS=0
62CONFIG_SLAB=y 59CONFIG_SLAB=y
63# CONFIG_TINY_SHMEM is not set 60# CONFIG_TINY_SHMEM is not set
64CONFIG_BASE_SMALL=0 61CONFIG_BASE_SMALL=0
@@ -70,7 +67,6 @@ CONFIG_BASE_SMALL=0
70CONFIG_MODULES=y 67CONFIG_MODULES=y
71CONFIG_MODULE_UNLOAD=y 68CONFIG_MODULE_UNLOAD=y
72CONFIG_MODULE_FORCE_UNLOAD=y 69CONFIG_MODULE_FORCE_UNLOAD=y
73CONFIG_OBSOLETE_MODPARM=y
74# CONFIG_MODVERSIONS is not set 70# CONFIG_MODVERSIONS is not set
75# CONFIG_MODULE_SRCVERSION_ALL is not set 71# CONFIG_MODULE_SRCVERSION_ALL is not set
76# CONFIG_KMOD is not set 72# CONFIG_KMOD is not set
@@ -81,6 +77,7 @@ CONFIG_STOP_MACHINE=y
81# 77#
82CONFIG_LBD=y 78CONFIG_LBD=y
83# CONFIG_BLK_DEV_IO_TRACE is not set 79# CONFIG_BLK_DEV_IO_TRACE is not set
80# CONFIG_LSF is not set
84 81
85# 82#
86# IO Schedulers 83# IO Schedulers
@@ -105,6 +102,7 @@ CONFIG_X86_PC=y
105CONFIG_GENERIC_CPU=y 102CONFIG_GENERIC_CPU=y
106CONFIG_X86_L1_CACHE_BYTES=128 103CONFIG_X86_L1_CACHE_BYTES=128
107CONFIG_X86_L1_CACHE_SHIFT=7 104CONFIG_X86_L1_CACHE_SHIFT=7
105CONFIG_X86_INTERNODE_CACHE_BYTES=128
108CONFIG_X86_TSC=y 106CONFIG_X86_TSC=y
109CONFIG_X86_GOOD_APIC=y 107CONFIG_X86_GOOD_APIC=y
110# CONFIG_MICROCODE is not set 108# CONFIG_MICROCODE is not set
@@ -116,6 +114,7 @@ CONFIG_X86_LOCAL_APIC=y
116CONFIG_MTRR=y 114CONFIG_MTRR=y
117CONFIG_SMP=y 115CONFIG_SMP=y
118CONFIG_SCHED_SMT=y 116CONFIG_SCHED_SMT=y
117CONFIG_SCHED_MC=y
119# CONFIG_PREEMPT_NONE is not set 118# CONFIG_PREEMPT_NONE is not set
120CONFIG_PREEMPT_VOLUNTARY=y 119CONFIG_PREEMPT_VOLUNTARY=y
121# CONFIG_PREEMPT is not set 120# CONFIG_PREEMPT is not set
@@ -138,6 +137,7 @@ CONFIG_NEED_MULTIPLE_NODES=y
138CONFIG_SPLIT_PTLOCK_CPUS=4 137CONFIG_SPLIT_PTLOCK_CPUS=4
139CONFIG_MIGRATION=y 138CONFIG_MIGRATION=y
140CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y 139CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y
140CONFIG_OUT_OF_LINE_PFN_TO_PAGE=y
141CONFIG_NR_CPUS=32 141CONFIG_NR_CPUS=32
142CONFIG_HOTPLUG_CPU=y 142CONFIG_HOTPLUG_CPU=y
143CONFIG_HPET_TIMER=y 143CONFIG_HPET_TIMER=y
@@ -289,6 +289,7 @@ CONFIG_IP_PNP_DHCP=y
289# CONFIG_INET_AH is not set 289# CONFIG_INET_AH is not set
290# CONFIG_INET_ESP is not set 290# CONFIG_INET_ESP is not set
291# CONFIG_INET_IPCOMP is not set 291# CONFIG_INET_IPCOMP is not set
292# CONFIG_INET_XFRM_TUNNEL is not set
292# CONFIG_INET_TUNNEL is not set 293# CONFIG_INET_TUNNEL is not set
293CONFIG_INET_DIAG=y 294CONFIG_INET_DIAG=y
294CONFIG_INET_TCP_DIAG=y 295CONFIG_INET_TCP_DIAG=y
@@ -300,6 +301,7 @@ CONFIG_IPV6=y
300# CONFIG_INET6_AH is not set 301# CONFIG_INET6_AH is not set
301# CONFIG_INET6_ESP is not set 302# CONFIG_INET6_ESP is not set
302# CONFIG_INET6_IPCOMP is not set 303# CONFIG_INET6_IPCOMP is not set
304# CONFIG_INET6_XFRM_TUNNEL is not set
303# CONFIG_INET6_TUNNEL is not set 305# CONFIG_INET6_TUNNEL is not set
304# CONFIG_IPV6_TUNNEL is not set 306# CONFIG_IPV6_TUNNEL is not set
305# CONFIG_NETFILTER is not set 307# CONFIG_NETFILTER is not set
@@ -704,7 +706,6 @@ CONFIG_S2IO=m
704# Wireless LAN (non-hamradio) 706# Wireless LAN (non-hamradio)
705# 707#
706# CONFIG_NET_RADIO is not set 708# CONFIG_NET_RADIO is not set
707# CONFIG_NET_WIRELESS_RTNETLINK is not set
708 709
709# 710#
710# Wan interfaces 711# Wan interfaces
@@ -791,7 +792,7 @@ CONFIG_HW_CONSOLE=y
791# 792#
792CONFIG_SERIAL_8250=y 793CONFIG_SERIAL_8250=y
793CONFIG_SERIAL_8250_CONSOLE=y 794CONFIG_SERIAL_8250_CONSOLE=y
794# CONFIG_SERIAL_8250_ACPI is not set 795CONFIG_SERIAL_8250_PCI=y
795CONFIG_SERIAL_8250_NR_UARTS=4 796CONFIG_SERIAL_8250_NR_UARTS=4
796CONFIG_SERIAL_8250_RUNTIME_UARTS=4 797CONFIG_SERIAL_8250_RUNTIME_UARTS=4
797# CONFIG_SERIAL_8250_EXTENDED is not set 798# CONFIG_SERIAL_8250_EXTENDED is not set
@@ -921,6 +922,7 @@ CONFIG_HWMON=y
921# Digital Video Broadcasting Devices 922# Digital Video Broadcasting Devices
922# 923#
923# CONFIG_DVB is not set 924# CONFIG_DVB is not set
925# CONFIG_USB_DABUSB is not set
924 926
925# 927#
926# Graphics support 928# Graphics support
@@ -932,6 +934,8 @@ CONFIG_VIDEO_SELECT=y
932# Console display driver support 934# Console display driver support
933# 935#
934CONFIG_VGA_CONSOLE=y 936CONFIG_VGA_CONSOLE=y
937CONFIG_VGACON_SOFT_SCROLLBACK=y
938CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=256
935CONFIG_DUMMY_CONSOLE=y 939CONFIG_DUMMY_CONSOLE=y
936 940
937# 941#
@@ -1058,15 +1062,6 @@ CONFIG_USB_HIDINPUT=y
1058# CONFIG_USB_MICROTEK is not set 1062# CONFIG_USB_MICROTEK is not set
1059 1063
1060# 1064#
1061# USB Multimedia devices
1062#
1063# CONFIG_USB_DABUSB is not set
1064
1065#
1066# Video4Linux support is needed for USB Multimedia device support
1067#
1068
1069#
1070# USB Network Adapters 1065# USB Network Adapters
1071# 1066#
1072# CONFIG_USB_CATC is not set 1067# CONFIG_USB_CATC is not set
@@ -1118,9 +1113,15 @@ CONFIG_USB_MON=y
1118# CONFIG_MMC is not set 1113# CONFIG_MMC is not set
1119 1114
1120# 1115#
1116# LED devices
1117#
1118# CONFIG_NEW_LEDS is not set
1119
1120#
1121# InfiniBand support 1121# InfiniBand support
1122# 1122#
1123# CONFIG_INFINIBAND is not set 1123# CONFIG_INFINIBAND is not set
1124# CONFIG_IPATH_CORE is not set
1124 1125
1125# 1126#
1126# EDAC - error detection and reporting (RAS) (EXPERIMENTAL) 1127# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
@@ -1128,6 +1129,11 @@ CONFIG_USB_MON=y
1128# CONFIG_EDAC is not set 1129# CONFIG_EDAC is not set
1129 1130
1130# 1131#
1132# Real Time Clock
1133#
1134# CONFIG_RTC_CLASS is not set
1135
1136#
1131# Firmware Drivers 1137# Firmware Drivers
1132# 1138#
1133# CONFIG_EDD is not set 1139# CONFIG_EDD is not set