summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorPekka Enberg <penberg@kernel.org>2012-10-03 09:57:17 +0300
committerPekka Enberg <penberg@kernel.org>2012-10-03 09:57:17 +0300
commite2087be35a8ed101c1e748ef688c889419c69829 (patch)
tree9ad1039f9a8b5b887f0007571bd2c8ff63d9536c /mm
parentf4178cdddd4cb860a17f363fe13264fff03da7f2 (diff)
parentdffa3f985047979ace185e253da89cabda3f7b31 (diff)
downloadlinux-e2087be35a8ed101c1e748ef688c889419c69829.tar.bz2
Merge branch 'slab/tracing' into slab/for-linus
Diffstat (limited to 'mm')
-rw-r--r--mm/slab.c2
-rw-r--r--mm/slob.c2
2 files changed, 2 insertions, 2 deletions
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);