diff --git a/debian/changelog b/debian/changelog index bb8daf3da..afae60b15 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ linux-2.6 (2.6.32~rc5-1) UNRELEASED; urgency=low * [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 Mon, 26 Oct 2009 01:18:26 +0000 diff --git a/debian/config/config b/debian/config/config index 2edc09599..e6b9c356a 100644 --- a/debian/config/config +++ b/debian/config/config @@ -2965,8 +2965,8 @@ CONFIG_EVENT_PROFILE=y 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_SCHED_DEBUG=y # 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