diff options
| author | Pekka Enberg <penberg@kernel.org> | 2012-10-03 08:57:17 +0200 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2012-10-03 08:57:17 +0200 |
| commit | e2087be35a8ed101c1e748ef688c889419c69829 (patch) | |
| tree | 9ad1039f9a8b5b887f0007571bd2c8ff63d9536c | |
| parent | Merge branch 'slab/common-for-cgroups' into slab/for-linus (diff) | |
| parent | mm/slab: Fix kmem_cache_alloc_node_trace() declaration (diff) | |
| download | linux-e2087be35a8ed101c1e748ef688c889419c69829.tar.xz linux-e2087be35a8ed101c1e748ef688c889419c69829.zip | |
Merge branch 'slab/tracing' into slab/for-linus
| -rw-r--r-- | include/linux/slab_def.h | 14 | ||||
| -rw-r--r-- | mm/slab.c | 2 | ||||
| -rw-r--r-- | mm/slob.c | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h index e98caebdd0bc..cc290f0bdb34 100644 --- a/include/linux/slab_def.h +++ b/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 @@ found: #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); } diff --git a/mm/slab.c b/mm/slab.c index a99f71a39baf..87c55b0e3e0e 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -3824,7 +3824,7 @@ void *kmem_cache_alloc_node_trace(struct kmem_cache *cachep, { void *ret; - ret = slab_alloc_node(cachep, flags, nodeid, _RET_IP); + ret = slab_alloc_node(cachep, flags, nodeid, _RET_IP_); trace_kmalloc_node(_RET_IP_, ret, size, cachep->size, diff --git a/mm/slob.c b/mm/slob.c index f3a5ced392d7..a08e4681fd0d 100644 --- a/mm/slob.c +++ b/mm/slob.c @@ -482,7 +482,7 @@ void *__kmalloc_track_caller(size_t size, gfp_t gfp, unsigned long caller) } #ifdef CONFIG_NUMA -void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags, +void *__kmalloc_node_track_caller(size_t size, gfp_t gfp, int node, unsigned long caller) { return __do_kmalloc_node(size, gfp, node, caller); |