commit 4052147c0afa1cf05780ed846f37e87cdde9f628
author Ezequiel Garcia <elezegarcia@gmail.com> Sat Sep 08 17:47:56 2012 -0300
committer Pekka Enberg <penberg@kernel.org> Tue Sep 25 10:17:24 2012 +0300
tree 521702d46c91430e77c1051f98f40da31a260f0d
parent 7c0cb9c64f83dd9bf18b139ac0de00daba6087c2

mm, slab: Match SLAB and SLUB kmem_cache_alloc_xxx_trace() prototype

This long (seemingly unnecessary) patch does not fix anything and
its only goal is to produce common code between SLAB and SLUB.

Cc: Christoph Lameter <cl@linux.com>
Signed-off-by: Ezequiel Garcia <elezegarcia@gmail.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>

mm/slab.c

diff --git a/mm/slab.c b/mm/slab.c
index 6c35679..4c54a23 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -3835,7 +3835,7 @@
 
 #ifdef CONFIG_TRACING
 void *
-kmem_cache_alloc_trace(size_t size, struct kmem_cache *cachep, gfp_t flags)
+kmem_cache_alloc_trace(struct kmem_cache *cachep, gfp_t flags, size_t size)
 {
 	void *ret;
 
@@ -3862,10 +3862,10 @@
 EXPORT_SYMBOL(kmem_cache_alloc_node);
 
 #ifdef CONFIG_TRACING
-void *kmem_cache_alloc_node_trace(size_t size,
-				  struct kmem_cache *cachep,
+void *kmem_cache_alloc_node_trace(struct kmem_cache *cachep,
 				  gfp_t flags,
-				  int nodeid)
+				  int nodeid,
+				  size_t size)
 {
 	void *ret;
 
@@ -3887,7 +3887,7 @@
 	cachep = kmem_find_general_cachep(size, flags);
 	if (unlikely(ZERO_OR_NULL_PTR(cachep)))
 		return cachep;
-	return kmem_cache_alloc_node_trace(size, cachep, flags, node);
+	return kmem_cache_alloc_node_trace(cachep, flags, node, size);
 }
 
 #if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_TRACING)