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

This commit is contained in:
Pekka Enberg
2012-10-03 09:57:17 +03:00
3 changed files with 9 additions and 9 deletions

View File

@@ -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,