Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] x86-64: Update defconfig

Signed-off-by: Andi Kleen <ak@suse.de>

authored by

Andi Kleen and committed by
Andi Kleen
e9781093 db98e0b4

+37 -16
+37 -16
arch/x86_64/defconfig
··· 1 1 # 2 2 # Automatically generated make config: don't edit 3 - # Linux kernel version: 2.6.20-git8 4 - # Tue Feb 13 11:25:16 2007 3 + # Linux kernel version: 2.6.21-rc3 4 + # Wed Mar 7 15:29:47 2007 5 5 # 6 6 CONFIG_X86_64=y 7 7 CONFIG_64BIT=y 8 8 CONFIG_X86=y 9 + CONFIG_GENERIC_TIME=y 10 + CONFIG_GENERIC_TIME_VSYSCALL=y 9 11 CONFIG_ZONE_DMA32=y 10 12 CONFIG_LOCKDEP_SUPPORT=y 11 13 CONFIG_STACKTRACE_SUPPORT=y ··· 45 43 CONFIG_SWAP=y 46 44 CONFIG_SYSVIPC=y 47 45 # CONFIG_IPC_NS is not set 46 + CONFIG_SYSVIPC_SYSCTL=y 48 47 CONFIG_POSIX_MQUEUE=y 49 48 # CONFIG_BSD_PROCESS_ACCT is not set 50 49 # CONFIG_TASKSTATS is not set ··· 56 53 # CONFIG_CPUSETS is not set 57 54 CONFIG_SYSFS_DEPRECATED=y 58 55 # CONFIG_RELAY is not set 56 + CONFIG_BLK_DEV_INITRD=y 59 57 CONFIG_INITRAMFS_SOURCE="" 60 58 CONFIG_CC_OPTIMIZE_FOR_SIZE=y 61 59 CONFIG_SYSCTL=y ··· 118 114 # CONFIG_X86_VSMP is not set 119 115 # CONFIG_MK8 is not set 120 116 # CONFIG_MPSC is not set 121 - CONFIG_MCORE2=y 122 - # CONFIG_GENERIC_CPU is not set 123 - CONFIG_X86_L1_CACHE_BYTES=64 124 - CONFIG_X86_L1_CACHE_SHIFT=6 125 - CONFIG_X86_INTERNODE_CACHE_BYTES=64 117 + # CONFIG_MCORE2 is not set 118 + CONFIG_GENERIC_CPU=y 119 + CONFIG_X86_L1_CACHE_BYTES=128 120 + CONFIG_X86_L1_CACHE_SHIFT=7 121 + CONFIG_X86_INTERNODE_CACHE_BYTES=128 126 122 CONFIG_X86_TSC=y 127 123 CONFIG_X86_GOOD_APIC=y 128 124 # CONFIG_MICROCODE is not set ··· 211 207 CONFIG_ACPI_AC=y 212 208 CONFIG_ACPI_BATTERY=y 213 209 CONFIG_ACPI_BUTTON=y 214 - # CONFIG_ACPI_HOTKEY is not set 215 210 CONFIG_ACPI_FAN=y 216 211 # CONFIG_ACPI_DOCK is not set 217 - # CONFIG_ACPI_BAY is not set 218 212 CONFIG_ACPI_PROCESSOR=y 219 213 CONFIG_ACPI_HOTPLUG_CPU=y 220 214 CONFIG_ACPI_THERMAL=y ··· 321 319 # CONFIG_INET_ESP is not set 322 320 # CONFIG_INET_IPCOMP is not set 323 321 # CONFIG_INET_XFRM_TUNNEL is not set 324 - # CONFIG_INET_TUNNEL is not set 322 + CONFIG_INET_TUNNEL=y 325 323 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set 326 324 # CONFIG_INET_XFRM_MODE_TUNNEL is not set 327 325 # CONFIG_INET_XFRM_MODE_BEET is not set ··· 423 421 # 424 422 # Plug and Play support 425 423 # 426 - # CONFIG_PNP is not set 424 + CONFIG_PNP=y 425 + # CONFIG_PNP_DEBUG is not set 426 + 427 + # 428 + # Protocols 429 + # 430 + CONFIG_PNPACPI=y 427 431 428 432 # 429 433 # Block devices ··· 449 441 CONFIG_BLK_DEV_RAM_COUNT=16 450 442 CONFIG_BLK_DEV_RAM_SIZE=4096 451 443 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 452 - CONFIG_BLK_DEV_INITRD=y 453 444 # CONFIG_CDROM_PKTCDVD is not set 454 445 # CONFIG_ATA_OVER_ETH is not set 455 446 ··· 458 451 # CONFIG_IBM_ASM is not set 459 452 # CONFIG_SGI_IOC4 is not set 460 453 # CONFIG_TIFM_CORE is not set 454 + # CONFIG_SONY_LAPTOP is not set 461 455 462 456 # 463 457 # ATA/ATAPI/MFM/RLL support ··· 485 477 # 486 478 CONFIG_IDE_GENERIC=y 487 479 # CONFIG_BLK_DEV_CMD640 is not set 480 + # CONFIG_BLK_DEV_IDEPNP is not set 488 481 CONFIG_BLK_DEV_IDEPCI=y 489 482 # CONFIG_IDEPCI_SHARE_IRQ is not set 490 483 # CONFIG_BLK_DEV_OFFBOARD is not set ··· 632 623 # CONFIG_SATA_VITESSE is not set 633 624 # CONFIG_SATA_INIC162X is not set 634 625 CONFIG_SATA_INTEL_COMBINED=y 626 + CONFIG_SATA_ACPI=y 635 627 # CONFIG_PATA_ALI is not set 636 628 # CONFIG_PATA_AMD is not set 637 629 # CONFIG_PATA_ARTOP is not set ··· 736 726 # CONFIG_BONDING is not set 737 727 # CONFIG_EQUALIZER is not set 738 728 CONFIG_TUN=y 729 + # CONFIG_NET_SB1000 is not set 739 730 740 731 # 741 732 # ARCnet devices ··· 931 920 CONFIG_SERIAL_8250=y 932 921 CONFIG_SERIAL_8250_CONSOLE=y 933 922 CONFIG_SERIAL_8250_PCI=y 923 + CONFIG_SERIAL_8250_PNP=y 934 924 CONFIG_SERIAL_8250_NR_UARTS=4 935 925 CONFIG_SERIAL_8250_RUNTIME_UARTS=4 936 926 # CONFIG_SERIAL_8250_EXTENDED is not set ··· 1013 1001 # CONFIG_I2C_NFORCE2 is not set 1014 1002 # CONFIG_I2C_OCORES is not set 1015 1003 # CONFIG_I2C_PARPORT_LIGHT is not set 1004 + # CONFIG_I2C_PASEMI is not set 1016 1005 # CONFIG_I2C_PROSAVAGE is not set 1017 1006 # CONFIG_I2C_SAVAGE4 is not set 1018 1007 # CONFIG_I2C_SIS5595 is not set ··· 1060 1047 # CONFIG_SENSORS_ADM1021 is not set 1061 1048 # CONFIG_SENSORS_ADM1025 is not set 1062 1049 # CONFIG_SENSORS_ADM1026 is not set 1050 + # CONFIG_SENSORS_ADM1029 is not set 1063 1051 # CONFIG_SENSORS_ADM1031 is not set 1064 1052 # CONFIG_SENSORS_ADM9240 is not set 1065 1053 # CONFIG_SENSORS_K8TEMP is not set ··· 1104 1090 # CONFIG_HWMON_DEBUG_CHIP is not set 1105 1091 1106 1092 # 1093 + # Multifunction device drivers 1094 + # 1095 + # CONFIG_MFD_SM501 is not set 1096 + 1097 + # 1107 1098 # Multimedia devices 1108 1099 # 1109 1100 # CONFIG_VIDEO_DEV is not set ··· 1122 1103 # 1123 1104 # Graphics support 1124 1105 # 1125 - # CONFIG_FIRMWARE_EDID is not set 1106 + # CONFIG_BACKLIGHT_LCD_SUPPORT is not set 1126 1107 # CONFIG_FB is not set 1127 1108 1128 1109 # ··· 1133 1114 CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=256 1134 1115 CONFIG_VIDEO_SELECT=y 1135 1116 CONFIG_DUMMY_CONSOLE=y 1136 - # CONFIG_BACKLIGHT_LCD_SUPPORT is not set 1137 1117 1138 1118 # 1139 1119 # Sound ··· 1148 1130 # Open Sound System 1149 1131 # 1150 1132 CONFIG_SOUND_PRIME=y 1151 - CONFIG_OBSOLETE_OSS=y 1133 + # CONFIG_OBSOLETE_OSS is not set 1152 1134 # CONFIG_SOUND_BT878 is not set 1153 - # CONFIG_SOUND_ES1371 is not set 1154 1135 CONFIG_SOUND_ICH=y 1155 1136 # CONFIG_SOUND_TRIDENT is not set 1156 1137 # CONFIG_SOUND_MSNDCLAS is not set ··· 1280 1263 # CONFIG_USB_RIO500 is not set 1281 1264 # CONFIG_USB_LEGOTOWER is not set 1282 1265 # CONFIG_USB_LCD is not set 1266 + # CONFIG_USB_BERRY_CHARGE is not set 1283 1267 # CONFIG_USB_LED is not set 1284 1268 # CONFIG_USB_CYPRESS_CY7C63 is not set 1285 1269 # CONFIG_USB_CYTHERM is not set ··· 1291 1273 # CONFIG_USB_SISUSBVGA is not set 1292 1274 # CONFIG_USB_LD is not set 1293 1275 # CONFIG_USB_TRANCEVIBRATOR is not set 1276 + # CONFIG_USB_IOWARRIOR is not set 1294 1277 # CONFIG_USB_TEST is not set 1295 1278 1296 1279 # ··· 1557 1538 CONFIG_LOG_BUF_SHIFT=18 1558 1539 CONFIG_DETECT_SOFTLOCKUP=y 1559 1540 # CONFIG_SCHEDSTATS is not set 1541 + # CONFIG_TIMER_STATS is not set 1560 1542 # CONFIG_DEBUG_SLAB is not set 1561 1543 # CONFIG_DEBUG_RT_MUTEXES is not set 1562 1544 # CONFIG_RT_MUTEX_TESTER is not set ··· 1576 1556 # CONFIG_FORCED_INLINING is not set 1577 1557 # CONFIG_RCU_TORTURE_TEST is not set 1578 1558 # CONFIG_LKDTM is not set 1559 + # CONFIG_FAULT_INJECTION is not set 1579 1560 # CONFIG_DEBUG_RODATA is not set 1580 1561 # CONFIG_IOMMU_DEBUG is not set 1581 1562 CONFIG_DEBUG_STACKOVERFLOW=y