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

[karo-tx-linux.git] / mm / slob.c

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