Index: linux-2.6.21-rc7-mm2/Documentation/vm/slabinfo.c
===================================================================
--- linux-2.6.21-rc7-mm2.orig/Documentation/vm/slabinfo.c	2007-04-27 04:43:53.000000000 -0700
+++ linux-2.6.21-rc7-mm2/Documentation/vm/slabinfo.c	2007-04-27 04:44:43.000000000 -0700
@@ -211,24 +211,6 @@ void decode_numa_list(int *numa, char *t
 	}
 }
 
-char *hackname(struct slabinfo *s)
-{
-	char *n = s->name;
-
-	if (n[0] == ':') {
-		char *nn = malloc(20);
-		char *p;
-
-		strncpy(nn, n, 20);
-		n = nn;
-		p = n + 4;
-		while (*p && *p !=':')
-			p++;
-		*p = 0;
-	}
-	return n;
-}
-
 void slab_validate(struct slabinfo *s)
 {
 	set_obj(s, "validate", 1);
@@ -312,14 +294,13 @@ void slabcache(struct slabinfo *s)
 		*p++ = 'T';
 
 	*p = 0;
-	n = hackname(s);
 	printf("%-21s %8ld %7d %8s %14s %4d %1d %3ld %3ld %s\n",
-			n, s->objects, s->object_size, size_str, dist_str,
-			s->objs_per_slab, s->order,
-			s->slabs ? (s->partial * 100) / s->slabs : 100,
-			s->slabs ? (s->objects * s->object_size * 100) /
-				(s->slabs * (page_size << s->order)) : 100,
-			flags);
+		s->name, s->objects, s->object_size, size_str, dist_str,
+		s->objs_per_slab, s->order,
+		s->slabs ? (s->partial * 100) / s->slabs : 100,
+		s->slabs ? (s->objects * s->object_size * 100) /
+			(s->slabs * (page_size << s->order)) : 100,
+		flags);
 }
 
 void slab_numa(struct slabinfo *s)
@@ -332,7 +313,6 @@ void slab_numa(struct slabinfo *s)
 
 	if (skip_zero && !s->slabs)
 		return;
-	n = hackname(s);
 
 	if (!line) {
 		printf("\nSlab             Node ");
@@ -343,7 +323,7 @@ void slab_numa(struct slabinfo *s)
 			printf("-----");
 		printf("\n");
 	}
-	printf("%-21s ", n);
+	printf("%-21s ", s->name);
 	for(node = 0; node <= highest_node; node++) {
 		char b[20];