From f50ae827c8d29c2a8a002c63cda8b4d05aaacecc Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Date: Sat, 18 Jun 2005 22:46:19 -0700
Subject: [PATCH] --- yaml --- r: 2239 b: refs/heads/master c:
 1944972d3bb651474a5021c9da8d0166ae19f1eb h: refs/heads/master i:   2237:
 5bc17d7d0f4d04adf4454e85bffb0c3841594058   2235:
 c245d08cf7b81e28578f4036f4186423f2866002   2231:
 806d04ae00c6dbf28792ed61913a94db8edf3555   2223:
 ffabe894b59fa9c5baa6f4378ee896a68040a2ef   2207:
 c0ee9318ea62aad3f3da157be50f9ed77e5ea9d9   2175:
 f3eb7b1a69aefa0f1e2f08c0f167a40a4df5ee9f v: v3

---
 [refs]                     | 2 +-
 trunk/include/linux/slab.h | 1 +
 trunk/mm/slab.c            | 6 ++++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ac116d19dd14..10f86de4922f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee57eef99b9e19194677f552ebc0690ec35d62db
+refs/heads/master: 1944972d3bb651474a5021c9da8d0166ae19f1eb
diff --git a/trunk/include/linux/slab.h b/trunk/include/linux/slab.h
index 7d66385ae750..76cf7e60216c 100644
--- a/trunk/include/linux/slab.h
+++ b/trunk/include/linux/slab.h
@@ -64,6 +64,7 @@ extern int kmem_cache_shrink(kmem_cache_t *);
 extern void *kmem_cache_alloc(kmem_cache_t *, unsigned int __nocast);
 extern void kmem_cache_free(kmem_cache_t *, void *);
 extern unsigned int kmem_cache_size(kmem_cache_t *);
+extern const char *kmem_cache_name(kmem_cache_t *);
 extern kmem_cache_t *kmem_find_general_cachep(size_t size, int gfpflags);
 
 /* Size description struct for general caches. */
diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c
index 840742641152..c78d343b3c5f 100644
--- a/trunk/mm/slab.c
+++ b/trunk/mm/slab.c
@@ -2620,6 +2620,12 @@ unsigned int kmem_cache_size(kmem_cache_t *cachep)
 }
 EXPORT_SYMBOL(kmem_cache_size);
 
+const char *kmem_cache_name(kmem_cache_t *cachep)
+{
+	return cachep->name;
+}
+EXPORT_SYMBOL_GPL(kmem_cache_name);
+
 struct ccupdate_struct {
 	kmem_cache_t *cachep;
 	struct array_cache *new[NR_CPUS];