Commit 7b59ebcd authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds
Browse files

UML: update defconfig 



Update defconfig.

Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJeff Dike <jdike@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4631a9a1

arch/um/defconfig

+187 −93
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.17-rc3

# Fri Apr 28 09:31:20 2006

# Linux kernel version: 2.6.24

# Thu Feb  7 11:48:55 2008

#

CONFIG_DEFCONFIG_LIST="arch/$ARCH/defconfig"

CONFIG_GENERIC_HARDIRQS=y

CONFIG_UML=y

CONFIG_MMU=y

CONFIG_NO_IOMEM=y

# CONFIG_TRACE_IRQFLAGS_SUPPORT is not set

CONFIG_LOCKDEP_SUPPORT=y

# CONFIG_STACKTRACE_SUPPORT is not set

CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_GENERIC_BUG=y

CONFIG_GENERIC_TIME=y

CONFIG_GENERIC_CLOCKEVENTS=y

CONFIG_IRQ_RELEASE_METHOD=y

CONFIG_HZ=100



#

# UML-specific options
@@ -40,11 +49,13 @@ CONFIG_M686=y 
# CONFIG_MCYRIXIII is not set

# CONFIG_MVIAC3_2 is not set

# CONFIG_MVIAC7 is not set

# CONFIG_MPSC is not set

# CONFIG_MCORE2 is not set

# CONFIG_GENERIC_CPU is not set

# CONFIG_X86_GENERIC is not set

CONFIG_X86_CMPXCHG=y

CONFIG_X86_XADD=y

CONFIG_X86_L1_CACHE_SHIFT=5

CONFIG_RWSEM_XCHGADD_ALGORITHM=y

CONFIG_X86_XADD=y

CONFIG_X86_PPRO_FENCE=y

CONFIG_X86_WP_WORKS_OK=y

CONFIG_X86_INVLPG=y
@@ -53,7 +64,12 @@ CONFIG_X86_POPAD_OK=y 
CONFIG_X86_GOOD_APIC=y

CONFIG_X86_USE_PPRO_CHECKSUM=y

CONFIG_X86_TSC=y

CONFIG_X86_CMOV=y

CONFIG_X86_MINIMUM_CPU_FAMILY=4

CONFIG_X86_DEBUGCTLMSR=y

CONFIG_UML_X86=y

CONFIG_X86_32=y

CONFIG_RWSEM_XCHGADD_ALGORITHM=y

# CONFIG_64BIT is not set

CONFIG_SEMAPHORE_SLEEPERS=y

# CONFIG_3_LEVEL_PGTABLES is not set
@@ -67,13 +83,18 @@ CONFIG_FLATMEM_MANUAL=y 
CONFIG_FLATMEM=y

CONFIG_FLAT_NODE_MEM_MAP=y

# CONFIG_SPARSEMEM_STATIC is not set

# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set

CONFIG_SPLIT_PTLOCK_CPUS=4

# CONFIG_RESOURCES_64BIT is not set

CONFIG_ZONE_DMA_FLAG=0

CONFIG_VIRT_TO_BUS=y

CONFIG_TICK_ONESHOT=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_GENERIC_CLOCKEVENTS_BUILD=y

CONFIG_LD_SCRIPT_DYN=y

CONFIG_NET=y

CONFIG_BINFMT_ELF=y

# CONFIG_BINFMT_AOUT is not set

CONFIG_BINFMT_MISC=m

CONFIG_HOSTFS=y

# CONFIG_HPPFS is not set
@@ -83,31 +104,38 @@ CONFIG_MAGIC_SYSRQ=y 
CONFIG_KERNEL_STACK_ORDER=0



#

# Code maturity level options

# General setup

#

CONFIG_EXPERIMENTAL=y

CONFIG_BROKEN_ON_SMP=y

CONFIG_INIT_ENV_ARG_LIMIT=32



#

# General setup

#

CONFIG_INIT_ENV_ARG_LIMIT=128

CONFIG_LOCALVERSION=""

CONFIG_LOCALVERSION_AUTO=y

CONFIG_SWAP=y

CONFIG_SYSVIPC=y

CONFIG_SYSVIPC_SYSCTL=y

CONFIG_POSIX_MQUEUE=y

CONFIG_BSD_PROCESS_ACCT=y

# CONFIG_BSD_PROCESS_ACCT_V3 is not set

CONFIG_SYSCTL=y

# CONFIG_TASKSTATS is not set

# CONFIG_USER_NS is not set

# CONFIG_PID_NS is not set

# CONFIG_AUDIT is not set

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=14

# CONFIG_CGROUPS is not set

CONFIG_FAIR_GROUP_SCHED=y

CONFIG_FAIR_USER_SCHED=y

# CONFIG_FAIR_CGROUP_SCHED is not set

CONFIG_SYSFS_DEPRECATED=y

# CONFIG_RELAY is not set

CONFIG_INITRAMFS_SOURCE=""

CONFIG_UID16=y

# CONFIG_BLK_DEV_INITRD is not set

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_SYSCTL=y

# CONFIG_EMBEDDED is not set

CONFIG_UID16=y

CONFIG_SYSCTL_SYSCALL=y

CONFIG_KALLSYMS=y

# CONFIG_KALLSYMS_ALL is not set

CONFIG_KALLSYMS_EXTRA_PASS=y
@@ -117,29 +145,36 @@ CONFIG_BUG=y 
CONFIG_ELF_CORE=y

CONFIG_BASE_FULL=y

CONFIG_FUTEX=y

CONFIG_ANON_INODES=y

CONFIG_EPOLL=y

CONFIG_SIGNALFD=y

CONFIG_TIMERFD=y

CONFIG_EVENTFD=y

CONFIG_SHMEM=y

CONFIG_VM_EVENT_COUNTERS=y

CONFIG_SLAB=y

# CONFIG_SLUB is not set

# CONFIG_SLOB is not set

# CONFIG_PROFILING is not set

# CONFIG_MARKERS is not set

# CONFIG_HAVE_OPROFILE is not set

# CONFIG_HAVE_KPROBES is not set

CONFIG_PROC_PAGE_MONITOR=y

CONFIG_SLABINFO=y

CONFIG_RT_MUTEXES=y

# CONFIG_TINY_SHMEM is not set

CONFIG_BASE_SMALL=0

# CONFIG_SLOB is not set



#

# Loadable module support

#

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_MODULE_FORCE_UNLOAD is not set

# CONFIG_MODVERSIONS is not set

# CONFIG_MODULE_SRCVERSION_ALL is not set

CONFIG_KMOD=y



#

# Block layer

#

CONFIG_BLOCK=y

# CONFIG_LBD is not set

# CONFIG_BLK_DEV_IO_TRACE is not set

# CONFIG_LSF is not set

# CONFIG_BLK_DEV_BSG is not set



#

# IO Schedulers
@@ -153,19 +188,16 @@ CONFIG_DEFAULT_AS=y 
# CONFIG_DEFAULT_CFQ is not set

# CONFIG_DEFAULT_NOOP is not set

CONFIG_DEFAULT_IOSCHED="anticipatory"



#

# Block devices

#

CONFIG_CLASSIC_RCU=y

# CONFIG_PREEMPT_RCU is not set

CONFIG_BLK_DEV=y

CONFIG_BLK_DEV_UBD=y

# CONFIG_BLK_DEV_UBD_SYNC is not set

CONFIG_BLK_DEV_COW_COMMON=y

# CONFIG_MMAPPER is not set

CONFIG_BLK_DEV_LOOP=m

# CONFIG_BLK_DEV_CRYPTOLOOP is not set

CONFIG_BLK_DEV_NBD=m

# CONFIG_BLK_DEV_RAM is not set

# CONFIG_BLK_DEV_INITRD is not set

# CONFIG_ATA_OVER_ETH is not set



#
@@ -185,32 +217,43 @@ CONFIG_CON_CHAN="xterm" 
CONFIG_SSL_CHAN="pts"

CONFIG_UNIX98_PTYS=y

CONFIG_LEGACY_PTYS=y

# CONFIG_RAW_DRIVER is not set

CONFIG_LEGACY_PTY_COUNT=32

# CONFIG_WATCHDOG is not set

CONFIG_UML_SOUND=m

CONFIG_SOUND=m

CONFIG_HOSTAUDIO=m

# CONFIG_HW_RANDOM is not set

CONFIG_UML_RANDOM=y

# CONFIG_MMAPPER is not set



#

# Generic Driver Options

#

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_STANDALONE=y

CONFIG_PREVENT_FIRMWARE_BUILD=y

# CONFIG_FW_LOADER is not set

# CONFIG_DEBUG_DRIVER is not set

# CONFIG_DEBUG_DEVRES is not set

# CONFIG_SYS_HYPERVISOR is not set



#

# Networking

#

CONFIG_NET=y



#

# Networking options

#

# CONFIG_NETDEBUG is not set

CONFIG_PACKET=y

CONFIG_PACKET_MMAP=y

CONFIG_UNIX=y

CONFIG_XFRM=y

# CONFIG_XFRM_USER is not set

# CONFIG_XFRM_SUB_POLICY is not set

# CONFIG_XFRM_MIGRATE is not set

# CONFIG_XFRM_STATISTICS is not set

# CONFIG_NET_KEY is not set

CONFIG_INET=y

# CONFIG_IP_MULTICAST is not set
@@ -226,28 +269,23 @@ CONFIG_IP_FIB_HASH=y 
# CONFIG_INET_IPCOMP is not set

# CONFIG_INET_XFRM_TUNNEL is not set

# CONFIG_INET_TUNNEL is not set

CONFIG_INET_XFRM_MODE_TRANSPORT=y

CONFIG_INET_XFRM_MODE_TUNNEL=y

CONFIG_INET_XFRM_MODE_BEET=y

# CONFIG_INET_LRO is not set

CONFIG_INET_DIAG=y

CONFIG_INET_TCP_DIAG=y

# CONFIG_TCP_CONG_ADVANCED is not set

CONFIG_TCP_CONG_BIC=y

CONFIG_TCP_CONG_CUBIC=y

CONFIG_DEFAULT_TCP_CONG="cubic"

# CONFIG_TCP_MD5SIG is not set

# CONFIG_IPV6 is not set

# CONFIG_INET6_XFRM_TUNNEL is not set

# CONFIG_INET6_TUNNEL is not set

# CONFIG_NETWORK_SECMARK is not set

# CONFIG_NETFILTER is not set



#

# DCCP Configuration (EXPERIMENTAL)

#

# CONFIG_IP_DCCP is not set



#

# SCTP Configuration (EXPERIMENTAL)

#

# CONFIG_IP_SCTP is not set



#

# TIPC Configuration (EXPERIMENTAL)

#

# CONFIG_TIPC is not set

# CONFIG_ATM is not set

# CONFIG_BRIDGE is not set
@@ -258,13 +296,8 @@ CONFIG_TCP_CONG_BIC=y 
# CONFIG_ATALK is not set

# CONFIG_X25 is not set

# CONFIG_LAPB is not set

# CONFIG_NET_DIVERT is not set

# CONFIG_ECONET is not set

# CONFIG_WAN_ROUTER is not set



#

# QoS and/or fair queueing

#

# CONFIG_NET_SCHED is not set



#
@@ -272,9 +305,20 @@ CONFIG_TCP_CONG_BIC=y 
#

# CONFIG_NET_PKTGEN is not set

# CONFIG_HAMRADIO is not set

# CONFIG_CAN is not set

# CONFIG_IRDA is not set

# CONFIG_BT is not set

# CONFIG_AF_RXRPC is not set



#

# Wireless

#

# CONFIG_CFG80211 is not set

# CONFIG_WIRELESS_EXT is not set

# CONFIG_MAC80211 is not set

# CONFIG_IEEE80211 is not set

# CONFIG_RFKILL is not set

# CONFIG_NET_9P is not set



#

# UML Network Devices
@@ -284,31 +328,24 @@ CONFIG_UML_NET_ETHERTAP=y 
CONFIG_UML_NET_TUNTAP=y

CONFIG_UML_NET_SLIP=y

CONFIG_UML_NET_DAEMON=y

# CONFIG_UML_NET_VDE is not set

CONFIG_UML_NET_MCAST=y

# CONFIG_UML_NET_PCAP is not set

CONFIG_UML_NET_SLIRP=y



#

# Network device support

#

CONFIG_NETDEVICES=y

# CONFIG_NETDEVICES_MULTIQUEUE is not set

CONFIG_DUMMY=m

# CONFIG_BONDING is not set

# CONFIG_MACVLAN is not set

# CONFIG_EQUALIZER is not set

CONFIG_TUN=m

# CONFIG_VETH is not set



#

# PHY device support

#



#

# Wireless LAN (non-hamradio)

#

# CONFIG_NET_RADIO is not set



#

# Wan interfaces

# Wireless LAN

#

# CONFIG_WLAN_PRE80211 is not set

# CONFIG_WLAN_80211 is not set

# CONFIG_WAN is not set

CONFIG_PPP=m

# CONFIG_PPP_MULTILINK is not set
@@ -319,18 +356,15 @@ CONFIG_PPP=m 
# CONFIG_PPP_BSDCOMP is not set

# CONFIG_PPP_MPPE is not set

# CONFIG_PPPOE is not set

# CONFIG_PPPOL2TP is not set

CONFIG_SLIP=m

# CONFIG_SLIP_COMPRESSED is not set

CONFIG_SLHC=m

# CONFIG_SLIP_SMART is not set

# CONFIG_SLIP_MODE_SLIP6 is not set

# CONFIG_SHAPER is not set

# CONFIG_NETCONSOLE is not set

# CONFIG_NETPOLL is not set

# CONFIG_NET_POLL_CONTROLLER is not set



#

# Connector - unified userspace <-> kernelspace linker

#

# CONFIG_CONNECTOR is not set



#
@@ -341,8 +375,8 @@ CONFIG_EXT2_FS=y 
# CONFIG_EXT2_FS_XIP is not set

CONFIG_EXT3_FS=y

# CONFIG_EXT3_FS_XATTR is not set

# CONFIG_EXT4DEV_FS is not set

CONFIG_JBD=y

# CONFIG_JBD_DEBUG is not set

CONFIG_REISERFS_FS=y

# CONFIG_REISERFS_CHECK is not set

# CONFIG_REISERFS_PROC_INFO is not set
@@ -350,11 +384,15 @@ CONFIG_REISERFS_FS=y 
# CONFIG_JFS_FS is not set

# CONFIG_FS_POSIX_ACL is not set

# CONFIG_XFS_FS is not set

# CONFIG_GFS2_FS is not set

# CONFIG_OCFS2_FS is not set

# CONFIG_MINIX_FS is not set

# CONFIG_ROMFS_FS is not set

CONFIG_INOTIFY=y

CONFIG_INOTIFY_USER=y

CONFIG_QUOTA=y

# CONFIG_QUOTA_NETLINK_INTERFACE is not set

CONFIG_PRINT_QUOTA_WARNING=y

# CONFIG_QFMT_V1 is not set

# CONFIG_QFMT_V2 is not set

CONFIG_QUOTACTL=y
@@ -383,10 +421,11 @@ CONFIG_JOLIET=y 
#

CONFIG_PROC_FS=y

CONFIG_PROC_KCORE=y

CONFIG_PROC_SYSCTL=y

CONFIG_SYSFS=y

CONFIG_TMPFS=y

# CONFIG_TMPFS_POSIX_ACL is not set

# CONFIG_HUGETLB_PAGE is not set

CONFIG_RAMFS=y

# CONFIG_CONFIGFS_FS is not set



#
@@ -405,10 +444,7 @@ CONFIG_RAMFS=y 
# CONFIG_QNX4FS_FS is not set

# CONFIG_SYSV_FS is not set

# CONFIG_UFS_FS is not set



#

# Network File Systems

#

CONFIG_NETWORK_FILESYSTEMS=y

# CONFIG_NFS_FS is not set

# CONFIG_NFSD is not set

# CONFIG_SMB_FS is not set
@@ -416,17 +452,12 @@ CONFIG_RAMFS=y 
# CONFIG_NCP_FS is not set

# CONFIG_CODA_FS is not set

# CONFIG_AFS_FS is not set

# CONFIG_9P_FS is not set



#

# Partition Types

#

# CONFIG_PARTITION_ADVANCED is not set

CONFIG_MSDOS_PARTITION=y



#

# Native Language Support

#

CONFIG_NLS=y

CONFIG_NLS_DEFAULT="iso8859-1"

# CONFIG_NLS_CODEPAGE_437 is not set
@@ -467,33 +498,83 @@ CONFIG_NLS_DEFAULT="iso8859-1" 
# CONFIG_NLS_KOI8_R is not set

# CONFIG_NLS_KOI8_U is not set

# CONFIG_NLS_UTF8 is not set

# CONFIG_DLM is not set



#

# Security options

#

# CONFIG_KEYS is not set

# CONFIG_SECURITY is not set



#

# Cryptographic options

#

# CONFIG_CRYPTO is not set



#

# Hardware crypto devices

#

# CONFIG_SECURITY_FILE_CAPABILITIES is not set

CONFIG_CRYPTO=y

# CONFIG_CRYPTO_SEQIV is not set

# CONFIG_CRYPTO_MANAGER is not set

# CONFIG_CRYPTO_HMAC is not set

# CONFIG_CRYPTO_XCBC is not set

# CONFIG_CRYPTO_NULL is not set

# CONFIG_CRYPTO_MD4 is not set

# CONFIG_CRYPTO_MD5 is not set

# CONFIG_CRYPTO_SHA1 is not set

# CONFIG_CRYPTO_SHA256 is not set

# CONFIG_CRYPTO_SHA512 is not set

# CONFIG_CRYPTO_WP512 is not set

# CONFIG_CRYPTO_TGR192 is not set

# CONFIG_CRYPTO_GF128MUL is not set

# CONFIG_CRYPTO_ECB is not set

# CONFIG_CRYPTO_CBC is not set

# CONFIG_CRYPTO_PCBC is not set

# CONFIG_CRYPTO_LRW is not set

# CONFIG_CRYPTO_XTS is not set

# CONFIG_CRYPTO_CTR is not set

# CONFIG_CRYPTO_GCM is not set

# CONFIG_CRYPTO_CCM is not set

# CONFIG_CRYPTO_CRYPTD is not set

# CONFIG_CRYPTO_DES is not set

# CONFIG_CRYPTO_FCRYPT is not set

# CONFIG_CRYPTO_BLOWFISH is not set

# CONFIG_CRYPTO_TWOFISH is not set

# CONFIG_CRYPTO_TWOFISH_586 is not set

# CONFIG_CRYPTO_SERPENT is not set

# CONFIG_CRYPTO_AES is not set

# CONFIG_CRYPTO_AES_586 is not set

# CONFIG_CRYPTO_CAST5 is not set

# CONFIG_CRYPTO_CAST6 is not set

# CONFIG_CRYPTO_TEA is not set

# CONFIG_CRYPTO_ARC4 is not set

# CONFIG_CRYPTO_KHAZAD is not set

# CONFIG_CRYPTO_ANUBIS is not set

# CONFIG_CRYPTO_SEED is not set

# CONFIG_CRYPTO_SALSA20 is not set

# CONFIG_CRYPTO_SALSA20_586 is not set

# CONFIG_CRYPTO_DEFLATE is not set

# CONFIG_CRYPTO_MICHAEL_MIC is not set

# CONFIG_CRYPTO_CRC32C is not set

# CONFIG_CRYPTO_CAMELLIA is not set

# CONFIG_CRYPTO_TEST is not set

# CONFIG_CRYPTO_AUTHENC is not set

# CONFIG_CRYPTO_LZO is not set

CONFIG_CRYPTO_HW=y



#

# Library routines

#

CONFIG_BITREVERSE=m

# CONFIG_CRC_CCITT is not set

# CONFIG_CRC16 is not set

# CONFIG_CRC_ITU_T is not set

CONFIG_CRC32=m

# CONFIG_CRC7 is not set

# CONFIG_LIBCRC32C is not set

CONFIG_PLIST=y

CONFIG_HAS_DMA=y



#

# Multi-device support (RAID and LVM)

# SCSI device support

#

# CONFIG_RAID_ATTRS is not set

# CONFIG_SCSI is not set

# CONFIG_SCSI_DMA is not set

# CONFIG_SCSI_NETLINK is not set

# CONFIG_MD is not set

# CONFIG_INPUT is not set
@@ -501,23 +582,36 @@ CONFIG_CRC32=m 
# Kernel hacking

#

# CONFIG_PRINTK_TIME is not set

CONFIG_ENABLE_WARN_DEPRECATED=y

CONFIG_ENABLE_MUST_CHECK=y

# CONFIG_UNUSED_SYMBOLS is not set

# CONFIG_DEBUG_FS is not set

CONFIG_DEBUG_KERNEL=y

CONFIG_LOG_BUF_SHIFT=14

# CONFIG_DEBUG_SHIRQ is not set

CONFIG_DETECT_SOFTLOCKUP=y

CONFIG_SCHED_DEBUG=y

# CONFIG_SCHEDSTATS is not set

# CONFIG_TIMER_STATS is not set

# CONFIG_DEBUG_SLAB is not set

# CONFIG_DEBUG_SLAB_LEAK is not set

# CONFIG_DEBUG_MUTEXES is not set

# CONFIG_DEBUG_RT_MUTEXES is not set

# CONFIG_RT_MUTEX_TESTER is not set

# CONFIG_DEBUG_SPINLOCK is not set

# CONFIG_DEBUG_MUTEXES is not set

# CONFIG_DEBUG_SPINLOCK_SLEEP is not set

# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set

# CONFIG_DEBUG_KOBJECT is not set

CONFIG_DEBUG_BUGVERBOSE=y

CONFIG_DEBUG_INFO=y

# CONFIG_DEBUG_FS is not set

# CONFIG_DEBUG_VM is not set

# CONFIG_DEBUG_LIST is not set

# CONFIG_DEBUG_SG is not set

CONFIG_FRAME_POINTER=y

# CONFIG_UNWIND_INFO is not set

CONFIG_FORCED_INLINING=y

# CONFIG_BOOT_PRINTK_DELAY is not set

# CONFIG_RCU_TORTURE_TEST is not set

# CONFIG_BACKTRACE_SELF_TEST is not set

# CONFIG_FAULT_INJECTION is not set

# CONFIG_SAMPLES is not set

# CONFIG_GPROF is not set

# CONFIG_GCOV is not set

# CONFIG_DEBUG_STACK_USAGE is not set