aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/slab_def.h
diff options
context:
space:
mode:
authorEzequiel Garcia <elezegarcia@gmail.com>2012-09-26 08:21:33 -0400
committerPekka Enberg <penberg@kernel.org>2012-09-29 03:02:27 -0400
commitdffa3f985047979ace185e253da89cabda3f7b31 (patch)
tree9e6cb5b7bcb8f80f436cdc045ecf95359f8a5e3f /include/linux/slab_def.h
parentc0b24b5100cb96cba71666953a8619a616684967 (diff)
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.h14
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);
159extern void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node); 159extern void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
160 160
161#ifdef CONFIG_TRACING 161#ifdef CONFIG_TRACING
162extern void *kmem_cache_alloc_node_trace(size_t size, 162extern void *kmem_cache_alloc_node_trace(struct kmem_cache *cachep,
163 struct kmem_cache *cachep,
164 gfp_t flags, 163 gfp_t flags,
165 int nodeid); 164 int nodeid,
165 size_t size);
166#else 166#else
167static __always_inline void * 167static __always_inline void *
168kmem_cache_alloc_node_trace(size_t size, 168kmem_cache_alloc_node_trace(struct kmem_cache *cachep,
169 struct kmem_cache *cachep,
170 gfp_t flags, 169 gfp_t flags,
171 int nodeid) 170 int nodeid,
171 size_t size)
172{ 172{
173 return kmem_cache_alloc_node(cachep, flags, nodeid); 173 return kmem_cache_alloc_node(cachep, flags, nodeid);
174} 174}
@@ -200,7 +200,7 @@ found:
200#endif 200#endif
201 cachep = malloc_sizes[i].cs_cachep; 201 cachep = malloc_sizes[i].cs_cachep;
202 202
203 return kmem_cache_alloc_node_trace(size, cachep, flags, node); 203 return kmem_cache_alloc_node_trace(cachep, flags, node, size);
204 } 204 }
205 return __kmalloc_node(size, flags, node); 205 return __kmalloc_node(size, flags, node);
206} 206}