Index: linux-2.6.21-rc6/mm/slub.c
===================================================================
--- linux-2.6.21-rc6.orig/mm/slub.c	2007-04-11 16:26:00.000000000 -0700
+++ linux-2.6.21-rc6/mm/slub.c	2007-04-11 16:27:22.000000000 -0700
@@ -1929,7 +1929,7 @@ static struct kmem_cache *create_kmalloc
 		flags = SLAB_CACHE_DMA;
 
 	down_write(&slub_lock);
-	if (!kmem_cache_open(s, gfp_flags, name, size, ARCH_KMALLOC_MINALIGN,
+	if (!kmem_cache_open(s, gfp_flags, name, max(32, size), ARCH_KMALLOC_MINALIGN,
 			flags, NULL, NULL))
 		goto panic;
 
@@ -2224,6 +2224,8 @@ struct kmem_cache *kmem_cache_create(con
 		s->inuse = max_t(int, s->inuse, ALIGN(size, sizeof(void *)));
 		if (sysfs_slab_alias(s, name))
 			goto err;
+		printk(KERN_INFO "Merged slab %s into %s\n",
+			name, s->name);
 	} else {
 		s = kmalloc(kmem_size, GFP_KERNEL);
 		if (s && kmem_cache_open(s, GFP_KERNEL, name,