diff options
| author | Ezequiel Garcia <elezegarcia@gmail.com> | 2012-09-08 17:47:56 -0300 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2012-09-25 10:17:24 +0300 |
| commit | 4052147c0afa1cf05780ed846f37e87cdde9f628 (patch) | |
| tree | 521702d46c91430e77c1051f98f40da31a260f0d /mm/slab.c | |
| parent | 7c0cb9c64f83dd9bf18b139ac0de00daba6087c2 (diff) | |
| download | linux-4052147c0afa1cf05780ed846f37e87cdde9f628.tar.gz linux-4052147c0afa1cf05780ed846f37e87cdde9f628.tar.bz2 linux-4052147c0afa1cf05780ed846f37e87cdde9f628.zip | |
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.c | 10 |
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); #ifdef CONFIG_TRACING void * -kmem_cache_alloc_trace(size_t size, struct kmem_cache *cachep, gfp_t flags) +kmem_cache_alloc_trace(struct kmem_cache *cachep, gfp_t flags, size_t size) { void *ret; @@ -3862,10 +3862,10 @@ void *kmem_cache_alloc_node(struct kmem_cache *cachep, gfp_t flags, int nodeid) EXPORT_SYMBOL(kmem_cache_alloc_node); #ifdef CONFIG_TRACING -void *kmem_cache_alloc_node_trace(size_t size, - struct kmem_cache *cachep, +void *kmem_cache_alloc_node_trace(struct kmem_cache *cachep, gfp_t flags, - int nodeid) + int nodeid, + size_t size) { void *ret; @@ -3887,7 +3887,7 @@ __do_kmalloc_node(size_t size, gfp_t flags, int node, unsigned long caller) cachep = kmem_find_general_cachep(size, flags); if (unlikely(ZERO_OR_NULL_PTR(cachep))) return cachep; - return kmem_cache_alloc_node_trace(size, cachep, flags, node); + return kmem_cache_alloc_node_trace(cachep, flags, node, size); } #if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_TRACING) |