* debian/changelog: Update.

* debian/config/config: Set TREE_RCU.
* debian/config/kernelarch-x86/config-arch-64: Remove duplicated options.

svn path=/dists/trunk/linux-2.6/; revision=14516
This commit is contained in:
Bastian Blank 2009-10-30 09:00:53 +00:00
parent 055aaac3cb
commit c2d45b15ba
3 changed files with 5 additions and 7 deletions

2
debian/changelog vendored
View File

@ -8,7 +8,7 @@ linux-2.6 (2.6.32~rc5-1) UNRELEASED; urgency=low
[ Bastian Blank ]
* [mips] Don't force EMBEDDED on.
* [sparc] Don't builtin Ext2 support.
* Enable PERF_EVENTS, EVENT_PROFILE, CRYPTO_VMAC, CRYPTO_GHASH.
* Enable PERF_EVENTS, EVENT_PROFILE, CRYPTO_VMAC, CRYPTO_GHASH, TREE_RCU.
* Use SLUB as default SLAB allocator.
-- Ben Hutchings <ben@decadent.org.uk> Mon, 26 Oct 2009 01:18:26 +0000

View File

@ -2914,9 +2914,12 @@ CONFIG_TASK_IO_ACCOUNTING=y
CONFIG_AUDIT=y
CONFIG_AUDITSYSCALL=y
## choice: RCU Implementation
# CONFIG_TREE_RCU is not set
CONFIG_TREE_RCU=y
# CONFIG_TREE_PREEMPT_RCU is not set
## end choice
# CONFIG_RCU_TRACE is not set
CONFIG_RCU_FANOUT=32
# CONFIG_RCU_FANOUT_EXACT is not set
# CONFIG_IKCONFIG is not set
CONFIG_LOG_BUF_SHIFT=17
CONFIG_GROUP_SCHED=y
@ -3795,7 +3798,6 @@ CONFIG_INITRAMFS_SOURCE=""
## file: unknown
##
# CONFIG_AGNX is not set
CONFIG_CLASSIC_RCU=y
CONFIG_COMPAT_NET_DEV_OPS=y
# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
# CONFIG_EPL is not set

View File

@ -130,11 +130,7 @@ CONFIG_FB_MATROX_MAVEN=m
##
## file: init/Kconfig
##
## choice: RCU Implementation
CONFIG_TREE_RCU=y
## end choice
CONFIG_RCU_FANOUT=64
# CONFIG_RCU_FANOUT_EXACT is not set
##
## file: lib/Kconfig.debug