diff options
author | Pekka Enberg <penberg@kernel.org> | 2012-10-03 02:57:17 -0400 |
---|---|---|
committer | Pekka Enberg <penberg@kernel.org> | 2012-10-03 02:57:17 -0400 |
commit | e2087be35a8ed101c1e748ef688c889419c69829 (patch) | |
tree | 9ad1039f9a8b5b887f0007571bd2c8ff63d9536c /mm/slob.c | |
parent | f4178cdddd4cb860a17f363fe13264fff03da7f2 (diff) | |
parent | dffa3f985047979ace185e253da89cabda3f7b31 (diff) |
Merge branch 'slab/tracing' into slab/for-linus
Diffstat (limited to 'mm/slob.c')
-rw-r--r-- | mm/slob.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -482,7 +482,7 @@ void *__kmalloc_track_caller(size_t size, gfp_t gfp, unsigned long caller) | |||
482 | } | 482 | } |
483 | 483 | ||
484 | #ifdef CONFIG_NUMA | 484 | #ifdef CONFIG_NUMA |
485 | void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags, | 485 | void *__kmalloc_node_track_caller(size_t size, gfp_t gfp, |
486 | int node, unsigned long caller) | 486 | int node, unsigned long caller) |
487 | { | 487 | { |
488 | return __do_kmalloc_node(size, gfp, node, caller); | 488 | return __do_kmalloc_node(size, gfp, node, caller); |