From 2a2cb6f0cac466f5ff615b08a32aa59096888d20 Mon Sep 17 00:00:00 2001 From: Ezequiel Garcia Date: Wed, 26 Sep 2012 09:21:33 -0300 Subject: [PATCH] --- yaml --- r: 330453 b: refs/heads/master c: dffa3f985047979ace185e253da89cabda3f7b31 h: refs/heads/master i: 330451: 24409507973cd959f1dee8d7fa838d131384efca v: v3 --- [refs] | 2 +- trunk/include/linux/slab_def.h | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 67c4fc8febbe..d3f0692afeea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c0b24b5100cb96cba71666953a8619a616684967 +refs/heads/master: dffa3f985047979ace185e253da89cabda3f7b31 diff --git a/trunk/include/linux/slab_def.h b/trunk/include/linux/slab_def.h index e98caebdd0bc..cc290f0bdb34 100644 --- a/trunk/include/linux/slab_def.h +++ b/trunk/include/linux/slab_def.h @@ -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 @@ static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node) #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); }