diff options
| author | Ezequiel Garcia <elezegarcia@gmail.com> | 2012-09-25 08:07:09 -0300 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2012-09-25 21:47:21 +0300 |
| commit | 1e5965bf1f018cc30a4659fa3f1a40146e4276f6 (patch) | |
| tree | 4f9ca14a0f8d2956af0c6a89ee4ee4f5121ae6b5 /mm | |
| parent | 592f41450d03f74747edd81779ae206a0647152f (diff) | |
| download | blackbird-op-linux-1e5965bf1f018cc30a4659fa3f1a40146e4276f6.tar.gz blackbird-op-linux-1e5965bf1f018cc30a4659fa3f1a40146e4276f6.zip | |
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')
| -rw-r--r-- | mm/slab.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mm/slab.c b/mm/slab.c index ca3849fe0584..3409eada242d 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -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(struct kmem_cache *cachep, +void *kmem_cache_alloc_node_trace(size_t size, + struct kmem_cache *cachep, gfp_t flags, - int nodeid, - size_t size) + int nodeid) { 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(cachep, flags, node, size); + return kmem_cache_alloc_node_trace(size, cachep, flags, node); } #if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_TRACING) |
