mm/slab: Fix kmem_cache_alloc_node_trace() declaration
authorEzequiel Garcia <elezegarcia@gmail.com>
Wed, 26 Sep 2012 12:21:33 +0000 (09:21 -0300)
committerPekka Enberg <penberg@kernel.org>
Sat, 29 Sep 2012 07:02:27 +0000 (10:02 +0300)
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>
include/linux/slab_def.h

index e98caeb..cc290f0 100644 (file)
@@ -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);
 }