Skip to content

Commit 903fcc6

Browse files
Andi KleenLinus Torvalds
authored andcommitted
[PATCH] x86_64: Update defconfig
Signed-off-by: Andi Kleen <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 6246b61 commit 903fcc6

File tree

1 file changed

+24
-18
lines changed

1 file changed

+24
-18
lines changed

arch/x86_64/defconfig

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
#
22
# Automatically generated make config: don't edit
3-
# Linux kernel version: 2.6.16-git9
4-
# Sat Mar 25 15:18:40 2006
3+
# Linux kernel version: 2.6.17-rc1
4+
# Mon Apr 3 16:11:14 2006
55
#
66
CONFIG_X86_64=y
77
CONFIG_64BIT=y
88
CONFIG_X86=y
99
CONFIG_SEMAPHORE_SLEEPERS=y
1010
CONFIG_MMU=y
1111
CONFIG_RWSEM_GENERIC_SPINLOCK=y
12+
CONFIG_GENERIC_HWEIGHT=y
1213
CONFIG_GENERIC_CALIBRATE_DELAY=y
1314
CONFIG_X86_CMPXCHG=y
1415
CONFIG_EARLY_PRINTK=y
@@ -55,10 +56,6 @@ CONFIG_BASE_FULL=y
5556
CONFIG_FUTEX=y
5657
CONFIG_EPOLL=y
5758
CONFIG_SHMEM=y
58-
CONFIG_CC_ALIGN_FUNCTIONS=0
59-
CONFIG_CC_ALIGN_LABELS=0
60-
CONFIG_CC_ALIGN_LOOPS=0
61-
CONFIG_CC_ALIGN_JUMPS=0
6259
CONFIG_SLAB=y
6360
# CONFIG_TINY_SHMEM is not set
6461
CONFIG_BASE_SMALL=0
@@ -70,7 +67,6 @@ CONFIG_BASE_SMALL=0
7067
CONFIG_MODULES=y
7168
CONFIG_MODULE_UNLOAD=y
7269
CONFIG_MODULE_FORCE_UNLOAD=y
73-
CONFIG_OBSOLETE_MODPARM=y
7470
# CONFIG_MODVERSIONS is not set
7571
# CONFIG_MODULE_SRCVERSION_ALL is not set
7672
# CONFIG_KMOD is not set
@@ -81,6 +77,7 @@ CONFIG_STOP_MACHINE=y
8177
#
8278
CONFIG_LBD=y
8379
# CONFIG_BLK_DEV_IO_TRACE is not set
80+
# CONFIG_LSF is not set
8481

8582
#
8683
# IO Schedulers
@@ -105,6 +102,7 @@ CONFIG_X86_PC=y
105102
CONFIG_GENERIC_CPU=y
106103
CONFIG_X86_L1_CACHE_BYTES=128
107104
CONFIG_X86_L1_CACHE_SHIFT=7
105+
CONFIG_X86_INTERNODE_CACHE_BYTES=128
108106
CONFIG_X86_TSC=y
109107
CONFIG_X86_GOOD_APIC=y
110108
# CONFIG_MICROCODE is not set
@@ -116,6 +114,7 @@ CONFIG_X86_LOCAL_APIC=y
116114
CONFIG_MTRR=y
117115
CONFIG_SMP=y
118116
CONFIG_SCHED_SMT=y
117+
CONFIG_SCHED_MC=y
119118
# CONFIG_PREEMPT_NONE is not set
120119
CONFIG_PREEMPT_VOLUNTARY=y
121120
# CONFIG_PREEMPT is not set
@@ -138,6 +137,7 @@ CONFIG_NEED_MULTIPLE_NODES=y
138137
CONFIG_SPLIT_PTLOCK_CPUS=4
139138
CONFIG_MIGRATION=y
140139
CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y
140+
CONFIG_OUT_OF_LINE_PFN_TO_PAGE=y
141141
CONFIG_NR_CPUS=32
142142
CONFIG_HOTPLUG_CPU=y
143143
CONFIG_HPET_TIMER=y
@@ -289,6 +289,7 @@ CONFIG_IP_PNP_DHCP=y
289289
# CONFIG_INET_AH is not set
290290
# CONFIG_INET_ESP is not set
291291
# CONFIG_INET_IPCOMP is not set
292+
# CONFIG_INET_XFRM_TUNNEL is not set
292293
# CONFIG_INET_TUNNEL is not set
293294
CONFIG_INET_DIAG=y
294295
CONFIG_INET_TCP_DIAG=y
@@ -300,6 +301,7 @@ CONFIG_IPV6=y
300301
# CONFIG_INET6_AH is not set
301302
# CONFIG_INET6_ESP is not set
302303
# CONFIG_INET6_IPCOMP is not set
304+
# CONFIG_INET6_XFRM_TUNNEL is not set
303305
# CONFIG_INET6_TUNNEL is not set
304306
# CONFIG_IPV6_TUNNEL is not set
305307
# CONFIG_NETFILTER is not set
@@ -704,7 +706,6 @@ CONFIG_S2IO=m
704706
# Wireless LAN (non-hamradio)
705707
#
706708
# CONFIG_NET_RADIO is not set
707-
# CONFIG_NET_WIRELESS_RTNETLINK is not set
708709

709710
#
710711
# Wan interfaces
@@ -791,7 +792,7 @@ CONFIG_HW_CONSOLE=y
791792
#
792793
CONFIG_SERIAL_8250=y
793794
CONFIG_SERIAL_8250_CONSOLE=y
794-
# CONFIG_SERIAL_8250_ACPI is not set
795+
CONFIG_SERIAL_8250_PCI=y
795796
CONFIG_SERIAL_8250_NR_UARTS=4
796797
CONFIG_SERIAL_8250_RUNTIME_UARTS=4
797798
# CONFIG_SERIAL_8250_EXTENDED is not set
@@ -921,6 +922,7 @@ CONFIG_HWMON=y
921922
# Digital Video Broadcasting Devices
922923
#
923924
# CONFIG_DVB is not set
925+
# CONFIG_USB_DABUSB is not set
924926

925927
#
926928
# Graphics support
@@ -932,6 +934,8 @@ CONFIG_VIDEO_SELECT=y
932934
# Console display driver support
933935
#
934936
CONFIG_VGA_CONSOLE=y
937+
CONFIG_VGACON_SOFT_SCROLLBACK=y
938+
CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=256
935939
CONFIG_DUMMY_CONSOLE=y
936940

937941
#
@@ -1057,15 +1061,6 @@ CONFIG_USB_HIDINPUT=y
10571061
# CONFIG_USB_MDC800 is not set
10581062
# CONFIG_USB_MICROTEK is not set
10591063

1060-
#
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-
10691064
#
10701065
# USB Network Adapters
10711066
#
@@ -1117,16 +1112,27 @@ CONFIG_USB_MON=y
11171112
#
11181113
# CONFIG_MMC is not set
11191114

1115+
#
1116+
# LED devices
1117+
#
1118+
# CONFIG_NEW_LEDS is not set
1119+
11201120
#
11211121
# InfiniBand support
11221122
#
11231123
# CONFIG_INFINIBAND is not set
1124+
# CONFIG_IPATH_CORE is not set
11241125

11251126
#
11261127
# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
11271128
#
11281129
# CONFIG_EDAC is not set
11291130

1131+
#
1132+
# Real Time Clock
1133+
#
1134+
# CONFIG_RTC_CLASS is not set
1135+
11301136
#
11311137
# Firmware Drivers
11321138
#

0 commit comments

Comments
 (0)