From 8ce203f669170e824f24033395edd3e8b962ee36 Mon Sep 17 00:00:00 2001 From: Ezequiel Garcia Date: Tue, 25 Sep 2012 08:07:09 -0300 Subject: [PATCH] --- yaml --- r: 330450 b: refs/heads/master c: 1e5965bf1f018cc30a4659fa3f1a40146e4276f6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/mm/slab.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 36d0df37401e..0181f3de3bce 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 592f41450d03f74747edd81779ae206a0647152f +refs/heads/master: 1e5965bf1f018cc30a4659fa3f1a40146e4276f6 diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c index ca3849fe0584..3409eada242d 100644 --- a/trunk/mm/slab.c +++ b/trunk/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)