Merge branch 'slab/tracing' into slab/for-linus

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);