[kernel] r14516 - in dists/trunk/linux-2.6/debian: . config config/kernelarch-x86

[Bastian Blank]

Author: waldi
Date: Fri Oct 30 09:00:53 2009
New Revision: 14516

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

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/config
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Fri Oct 30 08:49:05 2009	(r14515)
+++ dists/trunk/linux-2.6/debian/changelog	Fri Oct 30 09:00:53 2009	(r14516)
@@ -8,7 +8,7 @@
   [ 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 at decadent.org.uk>  Mon, 26 Oct 2009 01:18:26 +0000

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Fri Oct 30 08:49:05 2009	(r14515)
+++ dists/trunk/linux-2.6/debian/config/config	Fri Oct 30 09:00:53 2009	(r14516)
@@ -2914,9 +2914,12 @@
 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 @@
 ## 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

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64	Fri Oct 30 08:49:05 2009	(r14515)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64	Fri Oct 30 09:00:53 2009	(r14516)
@@ -130,11 +130,7 @@
 ##
 ## 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