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];