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/slab.c | |
| parent | f4178cdddd4cb860a17f363fe13264fff03da7f2 (diff) | |
| parent | dffa3f985047979ace185e253da89cabda3f7b31 (diff) | |
| download | kernel-common-e2087be35a8ed101c1e748ef688c889419c69829.tar.gz kernel-common-e2087be35a8ed101c1e748ef688c889419c69829.tar.bz2 kernel-common-e2087be35a8ed101c1e748ef688c889419c69829.zip | |
Merge branch 'slab/tracing' into slab/for-linus
Diffstat (limited to 'mm/slab.c')
| -rw-r--r-- | mm/slab.c | 2 |
1 files changed, 1 insertions, 1 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, |