aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/slab.h9
-rw-r--r--mm/slab.c6
-rw-r--r--mm/slob.c6
-rw-r--r--mm/slub.c9
4 files changed, 8 insertions, 22 deletions
diff --git a/include/linux/slab.h b/include/linux/slab.h
index 83d1a1454b7e..743a10415122 100644
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -128,7 +128,6 @@ struct kmem_cache *kmem_cache_create(const char *, size_t, size_t,
128void kmem_cache_destroy(struct kmem_cache *); 128void kmem_cache_destroy(struct kmem_cache *);
129int kmem_cache_shrink(struct kmem_cache *); 129int kmem_cache_shrink(struct kmem_cache *);
130void kmem_cache_free(struct kmem_cache *, void *); 130void kmem_cache_free(struct kmem_cache *, void *);
131unsigned int kmem_cache_size(struct kmem_cache *);
132 131
133/* 132/*
134 * Please use this macro to create slab caches. Simply specify the 133 * Please use this macro to create slab caches. Simply specify the
@@ -388,6 +387,14 @@ static inline void *kzalloc_node(size_t size, gfp_t flags, int node)
388 return kmalloc_node(size, flags | __GFP_ZERO, node); 387 return kmalloc_node(size, flags | __GFP_ZERO, node);
389} 388}
390 389
390/*
391 * Determine the size of a slab object
392 */
393static inline unsigned int kmem_cache_size(struct kmem_cache *s)
394{
395 return s->object_size;
396}
397
391void __init kmem_cache_init_late(void); 398void __init kmem_cache_init_late(void);
392 399
393#endif /* _LINUX_SLAB_H */ 400#endif /* _LINUX_SLAB_H */
diff --git a/mm/slab.c b/mm/slab.c
index 6d5c83c6ddd5..1f7fd5f51f87 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -3969,12 +3969,6 @@ void kfree(const void *objp)
3969} 3969}
3970EXPORT_SYMBOL(kfree); 3970EXPORT_SYMBOL(kfree);
3971 3971
3972unsigned int kmem_cache_size(struct kmem_cache *cachep)
3973{
3974 return cachep->object_size;
3975}
3976EXPORT_SYMBOL(kmem_cache_size);
3977
3978/* 3972/*
3979 * This initializes kmem_list3 or resizes various caches for all nodes. 3973 * This initializes kmem_list3 or resizes various caches for all nodes.
3980 */ 3974 */
diff --git a/mm/slob.c b/mm/slob.c
index 287a88aa4a61..fffbc820774d 100644
--- a/mm/slob.c
+++ b/mm/slob.c
@@ -604,12 +604,6 @@ void kmem_cache_free(struct kmem_cache *c, void *b)
604} 604}
605EXPORT_SYMBOL(kmem_cache_free); 605EXPORT_SYMBOL(kmem_cache_free);
606 606
607unsigned int kmem_cache_size(struct kmem_cache *c)
608{
609 return c->object_size;
610}
611EXPORT_SYMBOL(kmem_cache_size);
612
613int __kmem_cache_shutdown(struct kmem_cache *c) 607int __kmem_cache_shutdown(struct kmem_cache *c)
614{ 608{
615 /* No way to check for remaining objects */ 609 /* No way to check for remaining objects */
diff --git a/mm/slub.c b/mm/slub.c
index 35483e0ab6bc..deee7c754a7d 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -3121,15 +3121,6 @@ error:
3121 return -EINVAL; 3121 return -EINVAL;
3122} 3122}
3123 3123
3124/*
3125 * Determine the size of a slab object
3126 */
3127unsigned int kmem_cache_size(struct kmem_cache *s)
3128{
3129 return s->object_size;
3130}
3131EXPORT_SYMBOL(kmem_cache_size);
3132
3133static void list_slab_objects(struct kmem_cache *s, struct page *page, 3124static void list_slab_objects(struct kmem_cache *s, struct page *page,
3134 const char *text) 3125 const char *text)
3135{ 3126{