aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/slab_def.h7
-rw-r--r--mm/slab.c10
2 files changed, 8 insertions, 9 deletions
diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
index 604ebc832a9a..e98caebdd0bc 100644
--- a/include/linux/slab_def.h
+++ b/include/linux/slab_def.h
@@ -111,11 +111,10 @@ void *kmem_cache_alloc(struct kmem_cache *, gfp_t);
111void *__kmalloc(size_t size, gfp_t flags); 111void *__kmalloc(size_t size, gfp_t flags);
112 112
113#ifdef CONFIG_TRACING 113#ifdef CONFIG_TRACING
114extern void *kmem_cache_alloc_trace(size_t size, 114extern void *kmem_cache_alloc_trace(struct kmem_cache *, gfp_t, size_t);
115 struct kmem_cache *cachep, gfp_t flags);
116#else 115#else
117static __always_inline void * 116static __always_inline void *
118kmem_cache_alloc_trace(size_t size, struct kmem_cache *cachep, gfp_t flags) 117kmem_cache_alloc_trace(struct kmem_cache *cachep, gfp_t flags, size_t size)
119{ 118{
120 return kmem_cache_alloc(cachep, flags); 119 return kmem_cache_alloc(cachep, flags);
121} 120}
@@ -148,7 +147,7 @@ found:
148#endif 147#endif
149 cachep = malloc_sizes[i].cs_cachep; 148 cachep = malloc_sizes[i].cs_cachep;
150 149
151 ret = kmem_cache_alloc_trace(size, cachep, flags); 150 ret = kmem_cache_alloc_trace(cachep, flags, size);
152 151
153 return ret; 152 return ret;
154 } 153 }
diff --git a/mm/slab.c b/mm/slab.c
index 6c356793612d..4c54a2357937 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -3835,7 +3835,7 @@ EXPORT_SYMBOL(kmem_cache_alloc);
3835 3835
3836#ifdef CONFIG_TRACING 3836#ifdef CONFIG_TRACING
3837void * 3837void *
3838kmem_cache_alloc_trace(size_t size, struct kmem_cache *cachep, gfp_t flags) 3838kmem_cache_alloc_trace(struct kmem_cache *cachep, gfp_t flags, size_t size)
3839{ 3839{
3840 void *ret; 3840 void *ret;
3841 3841
@@ -3862,10 +3862,10 @@ void *kmem_cache_alloc_node(struct kmem_cache *cachep, gfp_t flags, int nodeid)
3862EXPORT_SYMBOL(kmem_cache_alloc_node); 3862EXPORT_SYMBOL(kmem_cache_alloc_node);
3863 3863
3864#ifdef CONFIG_TRACING 3864#ifdef CONFIG_TRACING
3865void *kmem_cache_alloc_node_trace(size_t size, 3865void *kmem_cache_alloc_node_trace(struct kmem_cache *cachep,
3866 struct kmem_cache *cachep,
3867 gfp_t flags, 3866 gfp_t flags,
3868 int nodeid) 3867 int nodeid,
3868 size_t size)
3869{ 3869{
3870 void *ret; 3870 void *ret;
3871 3871
@@ -3887,7 +3887,7 @@ __do_kmalloc_node(size_t size, gfp_t flags, int node, unsigned long caller)
3887 cachep = kmem_find_general_cachep(size, flags); 3887 cachep = kmem_find_general_cachep(size, flags);
3888 if (unlikely(ZERO_OR_NULL_PTR(cachep))) 3888 if (unlikely(ZERO_OR_NULL_PTR(cachep)))
3889 return cachep; 3889 return cachep;
3890 return kmem_cache_alloc_node_trace(size, cachep, flags, node); 3890 return kmem_cache_alloc_node_trace(cachep, flags, node, size);
3891} 3891}
3892 3892
3893#if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_TRACING) 3893#if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_TRACING)