From 456d6e1bd1ff5609d50bf9761bbbc6ed4a35db34 Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Sat, 29 Sep 2012 10:00:59 +0300 Subject: [PATCH] --- yaml --- r: 330452 b: refs/heads/master c: c0b24b5100cb96cba71666953a8619a616684967 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 f5e55dc7e755..67c4fc8febbe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 82bd5508b4080e851ac1a9b62bed6d727b1b4a84 +refs/heads/master: c0b24b5100cb96cba71666953a8619a616684967 diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c index 3409eada242d..ca3849fe0584 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(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)