diff options
| author | Pekka Enberg <penberg@kernel.org> | 2012-10-03 09:57:17 +0300 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2012-10-03 09:57:17 +0300 |
| 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
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); |