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

diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
index e98caebdd0bc18775cef07c8b1d369082cf917e5..cc290f0bdb346efe82dbe0e87985e6d015ad58e1 100644 (file)
--- 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 a99f71a39bafd5f74c67dc0b56cb4f19a7dd65d7..87c55b0e3e0ed959a3a17238b108b078b403e14b 100644 (file)
--- 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 f3a5ced392d7fa4c4767ef761006174f4ef601eb..a08e4681fd0d630ff212e299f5b657f71e48c4b0 100644 (file)
--- 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);