Skip to content

Commit

Permalink
mm, slab: Remove silly function slab_buffer_size()
Browse files Browse the repository at this point in the history
This function is seldom used, and can be simply replaced with cachep->size.

Acked-by: David Rientjes <rientjes@google.com>
Signed-off-by: Ezequiel Garcia <elezegarcia@gmail.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
  • Loading branch information
ezequielgarcia authored and penberg committed Sep 25, 2012
1 parent 90f2cbb commit ff4fcd0
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 15 deletions.
5 changes: 0 additions & 5 deletions include/linux/slab_def.h
Original file line number Diff line number Diff line change
Expand Up @@ -113,17 +113,12 @@ void *__kmalloc(size_t size, gfp_t flags);
#ifdef CONFIG_TRACING
extern void *kmem_cache_alloc_trace(size_t size,
struct kmem_cache *cachep, gfp_t flags);
extern size_t slab_buffer_size(struct kmem_cache *cachep);
#else
static __always_inline void *
kmem_cache_alloc_trace(size_t size, struct kmem_cache *cachep, gfp_t flags)
{
return kmem_cache_alloc(cachep, flags);
}
static inline size_t slab_buffer_size(struct kmem_cache *cachep)
{
return 0;
}
#endif

static __always_inline void *kmalloc(size_t size, gfp_t flags)
Expand Down
12 changes: 2 additions & 10 deletions mm/slab.c
Original file line number Diff line number Diff line change
Expand Up @@ -498,14 +498,6 @@ static void **dbg_userword(struct kmem_cache *cachep, void *objp)

#endif

#ifdef CONFIG_TRACING
size_t slab_buffer_size(struct kmem_cache *cachep)
{
return cachep->size;
}
EXPORT_SYMBOL(slab_buffer_size);
#endif

/*
* Do not go above this order unless 0 objects fit into the slab or
* overridden on the command line.
Expand Down Expand Up @@ -3850,7 +3842,7 @@ kmem_cache_alloc_trace(size_t size, struct kmem_cache *cachep, gfp_t flags)
ret = __cache_alloc(cachep, flags, __builtin_return_address(0));

trace_kmalloc(_RET_IP_, ret,
size, slab_buffer_size(cachep), flags);
size, cachep->size, flags);
return ret;
}
EXPORT_SYMBOL(kmem_cache_alloc_trace);
Expand Down Expand Up @@ -3881,7 +3873,7 @@ void *kmem_cache_alloc_node_trace(size_t size,
ret = __cache_alloc_node(cachep, flags, nodeid,
__builtin_return_address(0));
trace_kmalloc_node(_RET_IP_, ret,
size, slab_buffer_size(cachep),
size, cachep->size,
flags, nodeid);
return ret;
}
Expand Down

0 comments on commit ff4fcd0

Please sign in to comment.