[kernel] r14512 - in dists/trunk/linux-2.6/debian: . config

[Bastian Blank]

Author: waldi
Date: Fri Oct 30 08:36:50 2009
New Revision: 14512

Log:
* debian/changelog: Update.
* debian/config/config
  - Set SLUB.
  - Remove SLAB related debugging options.

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Fri Oct 30 08:31:01 2009	(r14511)
+++ dists/trunk/linux-2.6/debian/changelog	Fri Oct 30 08:36:50 2009	(r14512)
@@ -9,6 +9,7 @@
   * [mips] Don't force EMBEDDED on.
   * [sparc] Don't builtin Ext2 support.
   * Enable PERF_EVENTS, EVENT_PROFILE.
+  * 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:31:01 2009	(r14511)
+++ dists/trunk/linux-2.6/debian/config/config	Fri Oct 30 08:36:50 2009	(r14512)
@@ -2965,8 +2965,8 @@
 CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_COMPAT_BRK is not set
 ## choice: Choose SLAB allocator
-CONFIG_SLAB=y
-# CONFIG_SLUB is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 ## end choice
 CONFIG_PROFILING=y
@@ -3064,7 +3064,8 @@
 # CONFIG_SCHEDSTATS is not set
 CONFIG_TIMER_STATS=y
 # CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_DEBUG_SLAB is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
 # CONFIG_DEBUG_KMEMLEAK is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set