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 /include/linux/slab_def.h | |
| 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 'include/linux/slab_def.h')
| -rw-r--r-- | include/linux/slab_def.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h index 604ebc832a9a..e98caebdd0bc 100644 --- a/include/linux/slab_def.h +++ b/include/linux/slab_def.h @@ -111,11 +111,10 @@ void *kmem_cache_alloc(struct kmem_cache *, gfp_t); 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 void *kmem_cache_alloc_trace(struct kmem_cache *, gfp_t, size_t); #else static __always_inline 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) { return kmem_cache_alloc(cachep, flags); } @@ -148,7 +147,7 @@ found: #endif cachep = malloc_sizes[i].cs_cachep; - ret = kmem_cache_alloc_trace(size, cachep, flags); + ret = kmem_cache_alloc_trace(cachep, flags, size); return ret; } |