aboutsummaryrefslogtreecommitdiffstats
path: root/mm/slab.c
diff options
context:
space:
mode:
authorEzequiel Garcia <elezegarcia@gmail.com>2012-09-08 16:47:56 -0400
committerPekka Enberg <penberg@kernel.org>2012-09-25 03:17:24 -0400
commit4052147c0afa1cf05780ed846f37e87cdde9f628 (patch)
tree521702d46c91430e77c1051f98f40da31a260f0d /mm/slab.c
parent7c0cb9c64f83dd9bf18b139ac0de00daba6087c2 (diff)
mm, slab: Match SLAB and SLUB kmem_cache_alloc_xxx_trace() prototype
This long (seemingly unnecessary) patch does not fix anything and its only goal is to produce common code between SLAB and SLUB. Cc: Christoph Lameter <cl@linux.com> Signed-off-by: Ezequiel Garcia <elezegarcia@gmail.com> Signed-off-by: Pekka Enberg <penberg@kernel.org>
Diffstat (limited to 'mm/slab.c')
-rw-r--r--mm/slab.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/mm/slab.c b/mm/slab.c
index 6c356793612d..4c54a2357937 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -3835,7 +3835,7 @@ EXPORT_SYMBOL(kmem_cache_alloc);
3835 3835
3836#ifdef CONFIG_TRACING 3836#ifdef CONFIG_TRACING
3837void * 3837void *
3838kmem_cache_alloc_trace(size_t size, struct kmem_cache *cachep, gfp_t flags) 3838kmem_cache_alloc_trace(struct kmem_cache *cachep, gfp_t flags, size_t size)
3839{ 3839{
3840 void *ret; 3840 void *ret;
3841 3841
@@ -3862,10 +3862,10 @@ void *kmem_cache_alloc_node(struct kmem_cache *cachep, gfp_t flags, int nodeid)
3862EXPORT_SYMBOL(kmem_cache_alloc_node); 3862EXPORT_SYMBOL(kmem_cache_alloc_node);
3863 3863
3864#ifdef CONFIG_TRACING 3864#ifdef CONFIG_TRACING
3865void *kmem_cache_alloc_node_trace(size_t size, 3865void *kmem_cache_alloc_node_trace(struct kmem_cache *cachep,
3866 struct kmem_cache *cachep,
3867 gfp_t flags, 3866 gfp_t flags,
3868 int nodeid) 3867 int nodeid,
3868 size_t size)
3869{ 3869{
3870 void *ret; 3870 void *ret;
3871 3871
@@ -3887,7 +3887,7 @@ __do_kmalloc_node(size_t size, gfp_t flags, int node, unsigned long caller)
3887 cachep = kmem_find_general_cachep(size, flags); 3887 cachep = kmem_find_general_cachep(size, flags);
3888 if (unlikely(ZERO_OR_NULL_PTR(cachep))) 3888 if (unlikely(ZERO_OR_NULL_PTR(cachep)))
3889 return cachep; 3889 return cachep;
3890 return kmem_cache_alloc_node_trace(size, cachep, flags, node); 3890 return kmem_cache_alloc_node_trace(cachep, flags, node, size);
3891} 3891}
3892 3892
3893#if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_TRACING) 3893#if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_TRACING)