From: Pekka Enberg <penberg@kernel.org>
Date: Sat, 29 Sep 2012 07:00:59 +0000 (+0300)
Subject: Revert "mm/slab: Fix kmem_cache_alloc_node_trace() declaration"
X-Git-Tag: v3.7-rc1~34^2~1^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c0b24b5100cb96cba71666953a8619a616684967;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

Revert "mm/slab: Fix kmem_cache_alloc_node_trace() declaration"

This reverts commit 1e5965bf1f018cc30a4659fa3f1a40146e4276f6. Ezequiel
Garcia has a better fix.
---

diff --git a/mm/slab.c b/mm/slab.c
index 3409ead..ca3849f 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(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 @@ __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(size, cachep, flags, node);
+	return kmem_cache_alloc_node_trace(cachep, flags, node, size);
 }
 
 #if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_TRACING)