Index: linux-2.6.21-rc6/mm/slub.c
===================================================================
--- linux-2.6.21-rc6.orig/mm/slub.c	2007-04-22 23:54:37.000000000 -0700
+++ linux-2.6.21-rc6/mm/slub.c	2007-04-22 23:57:41.000000000 -0700
@@ -3350,10 +3350,17 @@ struct saved_alias *alias_list;
 static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
 {
 	struct saved_alias *al;
+	char *n = kmalloc(strlen(name) + 2);
 
-	if (slab_state == SYSFS)
+	/* Unique namespace for the aliases */
+	n[0] = '_';
+	strcpy(n +1 , name);
+
+	if (slab_state == SYSFS) {
+		sysfs_remove_link(&slab_subsys.kset.kobj);
 		return sysfs_create_link(&slab_subsys.kset.kobj,
-						&s->kobj, name);
+						&s->kobj, n);
+	}
 
 	al = kmalloc(sizeof(struct saved_alias), GFP_KERNEL);
 	if (!al)