aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mm/slab.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/slab.c b/mm/slab.c
index 9733bb4009d9..c3d092dca039 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -3649,7 +3649,7 @@ __do_kmalloc_node(size_t size, gfp_t flags, int node, void *caller)
3649 return ret; 3649 return ret;
3650} 3650}
3651 3651
3652#if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_KMEMTRACE) 3652#if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_TRACING)
3653void *__kmalloc_node(size_t size, gfp_t flags, int node) 3653void *__kmalloc_node(size_t size, gfp_t flags, int node)
3654{ 3654{
3655 return __do_kmalloc_node(size, flags, node, 3655 return __do_kmalloc_node(size, flags, node,
@@ -3669,7 +3669,7 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node)
3669 return __do_kmalloc_node(size, flags, node, NULL); 3669 return __do_kmalloc_node(size, flags, node, NULL);
3670} 3670}
3671EXPORT_SYMBOL(__kmalloc_node); 3671EXPORT_SYMBOL(__kmalloc_node);
3672#endif /* CONFIG_DEBUG_SLAB */ 3672#endif /* CONFIG_DEBUG_SLAB || CONFIG_TRACING */
3673#endif /* CONFIG_NUMA */ 3673#endif /* CONFIG_NUMA */
3674 3674
3675/** 3675/**
@@ -3701,7 +3701,7 @@ static __always_inline void *__do_kmalloc(size_t size, gfp_t flags,
3701} 3701}
3702 3702
3703 3703
3704#if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_KMEMTRACE) 3704#if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_TRACING)
3705void *__kmalloc(size_t size, gfp_t flags) 3705void *__kmalloc(size_t size, gfp_t flags)
3706{ 3706{
3707 return __do_kmalloc(size, flags, __builtin_return_address(0)); 3707 return __do_kmalloc(size, flags, __builtin_return_address(0));