Commit 56720367 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

[PATCH] x86_64: Update defconfig 



Rerun and enable autofs 4, relayfs and softdog

Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6037d6bb

arch/x86_64/defconfig

+83 −15
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.13-git11

# Mon Sep 12 16:16:16 2005

# Linux kernel version: 2.6.14-git7

# Sat Nov  5 15:55:50 2005

#

CONFIG_X86_64=y

CONFIG_64BIT=y
@@ -35,7 +35,7 @@ CONFIG_POSIX_MQUEUE=y 
# CONFIG_BSD_PROCESS_ACCT is not set

CONFIG_SYSCTL=y

# CONFIG_AUDIT is not set

# CONFIG_HOTPLUG is not set

CONFIG_HOTPLUG=y

CONFIG_KOBJECT_UEVENT=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y
@@ -93,10 +93,11 @@ CONFIG_PREEMPT_NONE=y 
# CONFIG_PREEMPT_VOLUNTARY is not set

# CONFIG_PREEMPT is not set

CONFIG_PREEMPT_BKL=y

CONFIG_NUMA=y

CONFIG_K8_NUMA=y

CONFIG_X86_64_ACPI_NUMA=y

# CONFIG_NUMA_EMU is not set

CONFIG_ARCH_DISCONTIGMEM_ENABLE=y

CONFIG_NUMA=y

CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y

CONFIG_ARCH_SPARSEMEM_ENABLE=y

CONFIG_SELECT_MEMORY_MODEL=y
@@ -107,9 +108,10 @@ CONFIG_DISCONTIGMEM=y 
CONFIG_FLAT_NODE_MEM_MAP=y

CONFIG_NEED_MULTIPLE_NODES=y

# CONFIG_SPARSEMEM_STATIC is not set

CONFIG_SPLIT_PTLOCK_CPUS=4

CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y

CONFIG_HAVE_DEC_LOCK=y

CONFIG_NR_CPUS=32

CONFIG_HOTPLUG_CPU=y

CONFIG_HPET_TIMER=y

CONFIG_X86_PM_TIMER=y

CONFIG_HPET_EMULATE_RTC=y
@@ -117,6 +119,7 @@ CONFIG_GART_IOMMU=y 
CONFIG_SWIOTLB=y

CONFIG_X86_MCE=y

CONFIG_X86_MCE_INTEL=y

CONFIG_X86_MCE_AMD=y

CONFIG_PHYSICAL_START=0x100000

# CONFIG_KEXEC is not set

CONFIG_SECCOMP=y
@@ -136,11 +139,15 @@ CONFIG_PM=y 
# CONFIG_PM_DEBUG is not set

CONFIG_SOFTWARE_SUSPEND=y

CONFIG_PM_STD_PARTITION=""

CONFIG_SUSPEND_SMP=y



#

# ACPI (Advanced Configuration and Power Interface) Support

#

CONFIG_ACPI=y

CONFIG_ACPI_SLEEP=y

CONFIG_ACPI_SLEEP_PROC_FS=y

CONFIG_ACPI_SLEEP_PROC_SLEEP=y

CONFIG_ACPI_AC=y

CONFIG_ACPI_BATTERY=y

CONFIG_ACPI_BUTTON=y
@@ -148,6 +155,7 @@ CONFIG_ACPI_BUTTON=y 
CONFIG_ACPI_HOTKEY=m

CONFIG_ACPI_FAN=y

CONFIG_ACPI_PROCESSOR=y

CONFIG_ACPI_HOTPLUG_CPU=y

CONFIG_ACPI_THERMAL=y

CONFIG_ACPI_NUMA=y

# CONFIG_ACPI_ASUS is not set
@@ -158,7 +166,7 @@ CONFIG_ACPI_BLACKLIST_YEAR=2001 
CONFIG_ACPI_EC=y

CONFIG_ACPI_POWER=y

CONFIG_ACPI_SYSTEM=y

# CONFIG_ACPI_CONTAINER is not set

CONFIG_ACPI_CONTAINER=y



#

# CPU Frequency scaling
@@ -293,7 +301,6 @@ CONFIG_IPV6=y 
# Network testing

#

# CONFIG_NET_PKTGEN is not set

# CONFIG_NETFILTER_NETLINK is not set

# CONFIG_HAMRADIO is not set

# CONFIG_IRDA is not set

# CONFIG_BT is not set
@@ -311,6 +318,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y 
# CONFIG_FW_LOADER is not set

# CONFIG_DEBUG_DRIVER is not set



#

# Connector - unified userspace <-> kernelspace linker

#

# CONFIG_CONNECTOR is not set



#

# Memory Technology Devices (MTD)

#
@@ -354,6 +366,11 @@ CONFIG_IOSCHED_NOOP=y 
# CONFIG_IOSCHED_AS is not set

CONFIG_IOSCHED_DEADLINE=y

CONFIG_IOSCHED_CFQ=y

# CONFIG_DEFAULT_AS is not set

CONFIG_DEFAULT_DEADLINE=y

# CONFIG_DEFAULT_CFQ is not set

# CONFIG_DEFAULT_NOOP is not set

CONFIG_DEFAULT_IOSCHED="cfq"

# CONFIG_ATA_OVER_ETH is not set



#
@@ -450,6 +467,7 @@ CONFIG_BLK_DEV_SD=y 
CONFIG_SCSI_SPI_ATTRS=y

# CONFIG_SCSI_FC_ATTRS is not set

# CONFIG_SCSI_ISCSI_ATTRS is not set

# CONFIG_SCSI_SAS_ATTRS is not set



#

# SCSI low-level drivers
@@ -469,20 +487,24 @@ CONFIG_AIC79XX_DEBUG_MASK=0 
# CONFIG_AIC79XX_REG_PRETTY_PRINT is not set

# CONFIG_MEGARAID_NEWGEN is not set

# CONFIG_MEGARAID_LEGACY is not set

# CONFIG_MEGARAID_SAS is not set

CONFIG_SCSI_SATA=y

# CONFIG_SCSI_SATA_AHCI is not set

# CONFIG_SCSI_SATA_SVW is not set

CONFIG_SCSI_ATA_PIIX=y

# CONFIG_SCSI_SATA_MV is not set

# CONFIG_SCSI_SATA_NV is not set

# CONFIG_SCSI_SATA_PROMISE is not set

CONFIG_SCSI_SATA_NV=y

# CONFIG_SCSI_PDC_ADMA is not set

# CONFIG_SCSI_SATA_QSTOR is not set

# CONFIG_SCSI_SATA_PROMISE is not set

# CONFIG_SCSI_SATA_SX4 is not set

# CONFIG_SCSI_SATA_SIL is not set

# CONFIG_SCSI_SATA_SIL24 is not set

# CONFIG_SCSI_SATA_SIS is not set

# CONFIG_SCSI_SATA_ULI is not set

CONFIG_SCSI_SATA_VIA=y

# CONFIG_SCSI_SATA_VITESSE is not set

CONFIG_SCSI_SATA_INTEL_COMBINED=y

# CONFIG_SCSI_BUSLOGIC is not set

# CONFIG_SCSI_DMX3191D is not set

# CONFIG_SCSI_EATA is not set
@@ -525,6 +547,7 @@ CONFIG_BLK_DEV_DM=y 
CONFIG_FUSION=y

CONFIG_FUSION_SPI=y

# CONFIG_FUSION_FC is not set

# CONFIG_FUSION_SAS is not set

CONFIG_FUSION_MAX_SGE=128

# CONFIG_FUSION_CTL is not set
@@ -564,6 +587,7 @@ CONFIG_NET_ETHERNET=y 
CONFIG_MII=y

# CONFIG_HAPPYMEAL is not set

# CONFIG_SUNGEM is not set

# CONFIG_CASSINI is not set

CONFIG_NET_VENDOR_3COM=y

CONFIG_VORTEX=y

# CONFIG_TYPHOON is not set
@@ -740,7 +764,43 @@ CONFIG_LEGACY_PTY_COUNT=256 
#

# Watchdog Cards

#

# CONFIG_WATCHDOG is not set

CONFIG_WATCHDOG=y

# CONFIG_WATCHDOG_NOWAYOUT is not set



#

# Watchdog Device Drivers

#

CONFIG_SOFT_WATCHDOG=y

# CONFIG_ACQUIRE_WDT is not set

# CONFIG_ADVANTECH_WDT is not set

# CONFIG_ALIM1535_WDT is not set

# CONFIG_ALIM7101_WDT is not set

# CONFIG_SC520_WDT is not set

# CONFIG_EUROTECH_WDT is not set

# CONFIG_IB700_WDT is not set

# CONFIG_IBMASR is not set

# CONFIG_WAFER_WDT is not set

# CONFIG_I6300ESB_WDT is not set

# CONFIG_I8XX_TCO is not set

# CONFIG_SC1200_WDT is not set

# CONFIG_60XX_WDT is not set

# CONFIG_SBC8360_WDT is not set

# CONFIG_CPU5_WDT is not set

# CONFIG_W83627HF_WDT is not set

# CONFIG_W83877F_WDT is not set

# CONFIG_W83977F_WDT is not set

# CONFIG_MACHZ_WDT is not set



#

# PCI-based Watchdog Cards

#

# CONFIG_PCIPCWATCHDOG is not set

# CONFIG_WDTPCI is not set



#

# USB-based Watchdog Cards

#

# CONFIG_USBPCWATCHDOG is not set

CONFIG_HW_RANDOM=y

# CONFIG_NVRAM is not set

CONFIG_RTC=y
@@ -767,6 +827,7 @@ CONFIG_MAX_RAW_DEVS=256 
# TPM devices

#

# CONFIG_TCG_TPM is not set

# CONFIG_TELCLOCK is not set



#

# I2C support
@@ -783,6 +844,7 @@ CONFIG_MAX_RAW_DEVS=256 
#

CONFIG_HWMON=y

# CONFIG_HWMON_VID is not set

# CONFIG_SENSORS_HDAPS is not set

# CONFIG_HWMON_DEBUG_CHIP is not set



#
@@ -886,12 +948,15 @@ CONFIG_USB_UHCI_HCD=y 
# USB Device Class drivers

#

# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set

# CONFIG_USB_BLUETOOTH_TTY is not set

# CONFIG_USB_ACM is not set

CONFIG_USB_PRINTER=y



#

# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information

# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'

#



#

# may also be needed; see USB_STORAGE Help for more information

#

CONFIG_USB_STORAGE=y

# CONFIG_USB_STORAGE_DEBUG is not set
@@ -924,6 +989,7 @@ CONFIG_USB_HIDINPUT=y 
# CONFIG_USB_XPAD is not set

# CONFIG_USB_ATI_REMOTE is not set

# CONFIG_USB_KEYSPAN_REMOTE is not set

# CONFIG_USB_APPLETOUCH is not set



#

# USB Imaging devices
@@ -1005,7 +1071,7 @@ CONFIG_USB_MON=y 
#

# CONFIG_EDD is not set

# CONFIG_DELL_RBU is not set

CONFIG_DCDBAS=m

# CONFIG_DCDBAS is not set



#

# File systems
@@ -1037,7 +1103,7 @@ CONFIG_INOTIFY=y 
# CONFIG_QUOTA is not set

CONFIG_DNOTIFY=y

CONFIG_AUTOFS_FS=y

# CONFIG_AUTOFS4_FS is not set

CONFIG_AUTOFS4_FS=y

# CONFIG_FUSE_FS is not set



#
@@ -1068,7 +1134,7 @@ CONFIG_TMPFS=y 
CONFIG_HUGETLBFS=y

CONFIG_HUGETLB_PAGE=y

CONFIG_RAMFS=y

# CONFIG_RELAYFS_FS is not set

CONFIG_RELAYFS_FS=y



#

# Miscellaneous filesystems
@@ -1186,7 +1252,9 @@ CONFIG_DETECT_SOFTLOCKUP=y 
# CONFIG_DEBUG_KOBJECT is not set

# CONFIG_DEBUG_INFO is not set

CONFIG_DEBUG_FS=y

# CONFIG_DEBUG_VM is not set

# CONFIG_FRAME_POINTER is not set

# CONFIG_RCU_TORTURE_TEST is not set

CONFIG_INIT_DEBUG=y

# CONFIG_IOMMU_DEBUG is not set

CONFIG_KPROBES=y