diff options
author | Ezequiel Garcia <elezegarcia@gmail.com> | 2012-09-25 07:07:09 -0400 |
---|---|---|
committer | Pekka Enberg <penberg@kernel.org> | 2012-09-25 14:47:21 -0400 |
commit | 1e5965bf1f018cc30a4659fa3f1a40146e4276f6 (patch) | |
tree | 4f9ca14a0f8d2956af0c6a89ee4ee4f5121ae6b5 /mm/slab.c | |
parent | 592f41450d03f74747edd81779ae206a0647152f (diff) |
mm/slab: Fix kmem_cache_alloc_node_trace() declaration
The bug was introduced in commit 4052147c0afa ("mm, slab: Match SLAB
and SLUB kmem_cache_alloc_xxx_trace() prototype").
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 'mm/slab.c')
-rw-r--r-- | mm/slab.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -3862,10 +3862,10 @@ void *kmem_cache_alloc_node(struct kmem_cache *cachep, gfp_t flags, int nodeid) | |||
3862 | EXPORT_SYMBOL(kmem_cache_alloc_node); | 3862 | EXPORT_SYMBOL(kmem_cache_alloc_node); |
3863 | 3863 | ||
3864 | #ifdef CONFIG_TRACING | 3864 | #ifdef CONFIG_TRACING |
3865 | void *kmem_cache_alloc_node_trace(struct kmem_cache *cachep, | 3865 | void *kmem_cache_alloc_node_trace(size_t size, |
3866 | struct kmem_cache *cachep, | ||
3866 | gfp_t flags, | 3867 | gfp_t flags, |
3867 | int nodeid, | 3868 | 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(cachep, flags, node, size); | 3890 | return kmem_cache_alloc_node_trace(size, cachep, flags, node); |
3891 | } | 3891 | } |
3892 | 3892 | ||
3893 | #if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_TRACING) | 3893 | #if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_TRACING) |