From: Marc Fiuczynski Date: Mon, 8 Jan 2007 14:13:08 +0000 (+0000) Subject: DISABLE -> BUILTIN : CONFIG_X86_GENERIC X-Git-Tag: before-vanilla-2_6_16_38-vs2_0_3_rc1-merge~11 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a1254e8b163f0e89481dee2e19bd2a33f3f6d6af;p=linux-2.6.git DISABLE -> BUILTIN : CONFIG_X86_GENERIC 5 -> 7 : CONFIG_X86_L1_CACHE_SHIFT REMOVED -> BUILTIN : CONFIG_X86_INTEL_USERCOPY BUILTIN -> DISABLE : CONFIG_3_LEVEL_PGTABLES MODULE -> BUILTIN : CONFIG_BINFMT_MISC DISABLE -> BUILTIN : CONFIG_MAGIC_SYSRQ DISABLE -> BUILTIN : CONFIG_HIGHMEM DISABLE -> BUILTIN : CONFIG_HZ_100 BUILTIN -> DISABLE : CONFIG_HZ_250 250 -> 100 : CONFIG_HZ BUILTIN -> MODULE : CONFIG_IOSCHED_AS BUILTIN -> MODULE : CONFIG_IOSCHED_DEADLINE BUILTIN -> MODULE : CONFIG_BLK_DEV_LOOP MODULE -> DISABLE : CONFIG_IP_SCTP DISABLE -> BUILTIN : CONFIG_EXT2_FS_XIP REMOVED -> BUILTIN : CONFIG_FS_XIP DISABLE -> BUILTIN : CONFIG_INOTIFY DISABLE -> BUILTIN : CONFIG_CRAMFS BUILTIN -> DISABLE : CONFIG_CRYPTO_HMAC DISABLE -> MODULE : CONFIG_CRYPTO_CRC32C DISABLE -> MODULE : CONFIG_CRC16 DISABLE -> MODULE : CONFIG_LIBCRC32C REMOVED -> BUILTIN : CONFIG_DEBUG_HIGHMEM DISABLE -> REMOVED : CONFIG_SCTP_DBG_MSG DISABLE -> REMOVED : CONFIG_SCTP_DBG_OBJCNT DISABLE -> REMOVED : CONFIG_SCTP_HMAC_NONE DISABLE -> REMOVED : CONFIG_SCTP_HMAC_SHA1 BUILTIN -> REMOVED : CONFIG_SCTP_HMAC_MD5 --- diff --git a/configs/kernel-2.6.17-i686-uml-planetlab.config b/configs/kernel-2.6.17-i686-uml-planetlab.config index 0063aa478..6d240f130 100644 --- a/configs/kernel-2.6.17-i686-uml-planetlab.config +++ b/configs/kernel-2.6.17-i686-uml-planetlab.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.17-1.2142_FC4-1.planetlab -# Mon Aug 21 16:42:30 2006 +# Linux kernel version: 2.6.17-1.2187_FC5.0smp +# Mon Jan 8 14:00:52 2007 # CONFIG_GENERIC_HARDIRQS=y CONFIG_UML=y @@ -41,10 +41,10 @@ CONFIG_M686=y # CONFIG_MGEODE_LX is not set # CONFIG_MCYRIXIII is not set # CONFIG_MVIAC3_2 is not set -# CONFIG_X86_GENERIC is not set +CONFIG_X86_GENERIC=y CONFIG_X86_CMPXCHG=y CONFIG_X86_XADD=y -CONFIG_X86_L1_CACHE_SHIFT=5 +CONFIG_X86_L1_CACHE_SHIFT=7 CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_X86_PPRO_FENCE=y CONFIG_X86_WP_WORKS_OK=y @@ -53,6 +53,7 @@ CONFIG_X86_BSWAP=y CONFIG_X86_POPAD_OK=y CONFIG_X86_CMPXCHG64=y CONFIG_X86_GOOD_APIC=y +CONFIG_X86_INTEL_USERCOPY=y CONFIG_X86_USE_PPRO_CHECKSUM=y CONFIG_X86_TSC=y CONFIG_UML_X86=y @@ -60,7 +61,7 @@ CONFIG_UML_X86=y CONFIG_SEMAPHORE_SLEEPERS=y # CONFIG_HOST_2G_2G is not set CONFIG_TOP_ADDR=0xc0000000 -CONFIG_3_LEVEL_PGTABLES=y +# CONFIG_3_LEVEL_PGTABLES is not set CONFIG_STUB_CODE=0xbfffe000 CONFIG_STUB_DATA=0xbffff000 CONFIG_STUB_START=0xbfffe000 @@ -78,19 +79,19 @@ CONFIG_SPLIT_PTLOCK_CPUS=4096 CONFIG_LD_SCRIPT_DYN=y CONFIG_NET=y CONFIG_BINFMT_ELF=y -CONFIG_BINFMT_MISC=m +CONFIG_BINFMT_MISC=y CONFIG_HOSTFS=y # CONFIG_HPPFS is not set CONFIG_MCONSOLE=y -# CONFIG_MAGIC_SYSRQ is not set +CONFIG_MAGIC_SYSRQ=y CONFIG_NEST_LEVEL=0 -# CONFIG_HIGHMEM is not set +CONFIG_HIGHMEM=y CONFIG_KERNEL_STACK_ORDER=2 CONFIG_UML_REAL_TIME_CLOCK=y -# CONFIG_HZ_100 is not set -CONFIG_HZ_250=y +CONFIG_HZ_100=y +# CONFIG_HZ_250 is not set # CONFIG_HZ_1000 is not set -CONFIG_HZ=250 +CONFIG_HZ=100 # # Code maturity level options @@ -157,8 +158,8 @@ CONFIG_LSF=y # IO Schedulers # CONFIG_IOSCHED_NOOP=y -CONFIG_IOSCHED_AS=y -CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_AS=m +CONFIG_IOSCHED_DEADLINE=m CONFIG_IOSCHED_CFQ=y # CONFIG_DEFAULT_AS is not set # CONFIG_DEFAULT_DEADLINE is not set @@ -172,7 +173,7 @@ CONFIG_DEFAULT_IOSCHED="cfq" # CONFIG_BLK_DEV_UBD is not set # CONFIG_BLK_DEV_COW_COMMON is not set # CONFIG_MMAPPER is not set -CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_LOOP=m # CONFIG_BLK_DEV_CRYPTOLOOP is not set # CONFIG_BLK_DEV_VROOT is not set CONFIG_BLK_DEV_NBD=m @@ -369,12 +370,7 @@ CONFIG_VNET=m # # SCTP Configuration (EXPERIMENTAL) # -CONFIG_IP_SCTP=m -# CONFIG_SCTP_DBG_MSG is not set -# CONFIG_SCTP_DBG_OBJCNT is not set -# CONFIG_SCTP_HMAC_NONE is not set -# CONFIG_SCTP_HMAC_SHA1 is not set -CONFIG_SCTP_HMAC_MD5=y +# CONFIG_IP_SCTP is not set # # TIPC Configuration (EXPERIMENTAL) @@ -507,7 +503,8 @@ CONFIG_EXT2_FS=y CONFIG_EXT2_FS_XATTR=y CONFIG_EXT2_FS_POSIX_ACL=y CONFIG_EXT2_FS_SECURITY=y -# CONFIG_EXT2_FS_XIP is not set +CONFIG_EXT2_FS_XIP=y +CONFIG_FS_XIP=y CONFIG_EXT3_FS=y CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y @@ -522,7 +519,7 @@ CONFIG_FS_POSIX_ACL=y # CONFIG_OCFS2_FS is not set # CONFIG_MINIX_FS is not set # CONFIG_ROMFS_FS is not set -# CONFIG_INOTIFY is not set +CONFIG_INOTIFY=y CONFIG_QUOTA=y # CONFIG_QFMT_V1 is not set CONFIG_QFMT_V2=y @@ -573,7 +570,7 @@ CONFIG_RAMFS=y # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set -# CONFIG_CRAMFS is not set +CONFIG_CRAMFS=y # CONFIG_SQUASHFS is not set # CONFIG_VXFS_FS is not set # CONFIG_HPFS_FS is not set @@ -693,7 +690,7 @@ CONFIG_VSERVER_LEGACYNET=y # Cryptographic options # CONFIG_CRYPTO=y -CONFIG_CRYPTO_HMAC=y +# CONFIG_CRYPTO_HMAC is not set # CONFIG_CRYPTO_NULL is not set # CONFIG_CRYPTO_MD4 is not set CONFIG_CRYPTO_MD5=y @@ -716,7 +713,7 @@ CONFIG_CRYPTO_ARC4=m # CONFIG_CRYPTO_ANUBIS is not set # CONFIG_CRYPTO_DEFLATE is not set CONFIG_CRYPTO_MICHAEL_MIC=m -# CONFIG_CRYPTO_CRC32C is not set +CONFIG_CRYPTO_CRC32C=m # CONFIG_CRYPTO_TEST is not set # CONFIG_CRYPTO_SIGNATURE is not set # CONFIG_CRYPTO_MPILIB is not set @@ -729,9 +726,9 @@ CONFIG_CRYPTO_MICHAEL_MIC=m # Library routines # CONFIG_CRC_CCITT=m -# CONFIG_CRC16 is not set +CONFIG_CRC16=m CONFIG_CRC32=y -# CONFIG_LIBCRC32C is not set +CONFIG_LIBCRC32C=m CONFIG_ZLIB_INFLATE=y CONFIG_TEXTSEARCH=y CONFIG_TEXTSEARCH_KMP=m @@ -772,6 +769,7 @@ CONFIG_DEBUG_MUTEXES=y CONFIG_DEBUG_SPINLOCK=y CONFIG_DEBUG_SPINLOCK_SLEEP=y # CONFIG_DEBUG_KOBJECT is not set +CONFIG_DEBUG_HIGHMEM=y CONFIG_DEBUG_INFO=y CONFIG_DEBUG_FS=y CONFIG_DEBUG_VM=y