diff options
| author | Ezequiel Garcia <elezegarcia@gmail.com> | 2012-09-26 09:21:33 -0300 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2012-09-29 10:02:27 +0300 |
| commit | dffa3f985047979ace185e253da89cabda3f7b31 (patch) | |
| tree | 9e6cb5b7bcb8f80f436cdc045ecf95359f8a5e3f /include/linux/slab_def.h | |
| parent | c0b24b5100cb96cba71666953a8619a616684967 (diff) | |
| download | linux-dffa3f985047979ace185e253da89cabda3f7b31.tar.gz linux-dffa3f985047979ace185e253da89cabda3f7b31.tar.bz2 linux-dffa3f985047979ace185e253da89cabda3f7b31.zip | |
mm/slab: Fix kmem_cache_alloc_node_trace() declaration
This bug was introduced in commit 4052147 ("mm, slab: Match SLAB and
SLUB kmem_cache_alloc_xxx_trace() prototype").
Cc: David Rientjes <rientjes@google.com>
Reported-by: Fengguang Wu <fengguang.wu@intel.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 | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h index e98caebdd0bc..cc290f0bdb34 100644 --- a/include/linux/slab_def.h +++ b/include/linux/slab_def.h @@ -159,16 +159,16 @@ extern void *__kmalloc_node(size_t size, gfp_t flags, int node); extern void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node); #ifdef CONFIG_TRACING -extern void *kmem_cache_alloc_node_trace(size_t size, - struct kmem_cache *cachep, +extern void *kmem_cache_alloc_node_trace(struct kmem_cache *cachep, gfp_t flags, - int nodeid); + int nodeid, + size_t size); #else static __always_inline void * -kmem_cache_alloc_node_trace(size_t size, - struct kmem_cache *cachep, +kmem_cache_alloc_node_trace(struct kmem_cache *cachep, gfp_t flags, - int nodeid) + int nodeid, + size_t size) { return kmem_cache_alloc_node(cachep, flags, nodeid); } @@ -200,7 +200,7 @@ found: #endif cachep = malloc_sizes[i].cs_cachep; - return kmem_cache_alloc_node_trace(size, cachep, flags, node); + return kmem_cache_alloc_node_trace(cachep, flags, node, size); } return __kmalloc_node(size, flags, node); } |