---
 mm/slub.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Index: slub/mm/slub.c
===================================================================
--- slub.orig/mm/slub.c	2007-05-23 13:23:53.000000000 -0700
+++ slub/mm/slub.c	2007-05-23 13:25:20.000000000 -0700
@@ -1667,9 +1667,12 @@ static int slub_min_objects = DEFAULT_MI
 
 /*
  * Merge control. If this is set then no merging of slab caches will occur.
- * (Could be removed. This was introduced to pacify the merge skeptics.)
  */
+#ifdef CONFIG_DEBUG_LOCK_ALLOC
+static int slub_nomerge = 1;
+#else
 static int slub_nomerge;
+#endif
 
 /*
  * Calculate the order of allocation given an slab object size.