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

[Ben Hutchings]

Author: benh
Date: Fri May 13 12:35:48 2011
New Revision: 17396

Log:
mm: Select SLAB allocator again

Although SLUB is currently the upstream default, this was set as an
experiment rather than a recommendation! SLUB generally has poorer
performance than SLAB on larger systems.

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 May 13 04:51:41 2011	(r17395)
+++ dists/trunk/linux-2.6/debian/changelog	Fri May 13 12:35:48 2011	(r17396)
@@ -13,6 +13,10 @@
   * [!x86] Disable TPM drivers. TPMs are currently only fitted in PCs.
   * rt2800usb: Enable support for more USB devices including
     Linksys WUSB600N (Closes: #596626)
+  * mm: Select SLAB allocator again. Although SLUB is currently the
+    upstream default, this was set as an experiment rather than a
+    recommendation! SLUB generally has poorer performance than SLAB on
+    larger systems.
 
  -- maximilian attems <maks at debian.org>  Tue, 10 May 2011 23:24:26 +0200
 

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Fri May 13 04:51:41 2011	(r17395)
+++ dists/trunk/linux-2.6/debian/config/config	Fri May 13 12:35:48 2011	(r17396)
@@ -3442,8 +3442,8 @@
 CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_COMPAT_BRK is not set
 ## choice: Choose SLAB allocator
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
 # CONFIG_SLOB is not set
 ## end choice
 CONFIG_PROFILING=y