diff options
Diffstat (limited to 'include/linux/slab.h')
-rw-r--r-- | include/linux/slab.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/slab.h b/include/linux/slab.h index e2ee5b268797..f88e08a5802c 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h | |||
@@ -77,11 +77,12 @@ struct cache_sizes { | |||
77 | }; | 77 | }; |
78 | extern struct cache_sizes malloc_sizes[]; | 78 | extern struct cache_sizes malloc_sizes[]; |
79 | 79 | ||
80 | #ifndef CONFIG_DEBUG_SLAB | ||
81 | extern void *__kmalloc(size_t, gfp_t); | 80 | extern void *__kmalloc(size_t, gfp_t); |
81 | #ifndef CONFIG_DEBUG_SLAB | ||
82 | #define ____kmalloc(size, flags) __kmalloc(size, flags) | ||
82 | #else | 83 | #else |
83 | extern void *__kmalloc_track_caller(size_t, gfp_t, void*); | 84 | extern void *__kmalloc_track_caller(size_t, gfp_t, void*); |
84 | #define __kmalloc(size, flags) \ | 85 | #define ____kmalloc(size, flags) \ |
85 | __kmalloc_track_caller(size, flags, __builtin_return_address(0)) | 86 | __kmalloc_track_caller(size, flags, __builtin_return_address(0)) |
86 | #endif | 87 | #endif |
87 | 88 | ||
@@ -173,6 +174,7 @@ static inline void *kcalloc(size_t n, size_t size, gfp_t flags) | |||
173 | #define kmem_ptr_validate(a, b) (0) | 174 | #define kmem_ptr_validate(a, b) (0) |
174 | #define kmem_cache_alloc_node(c, f, n) kmem_cache_alloc(c, f) | 175 | #define kmem_cache_alloc_node(c, f, n) kmem_cache_alloc(c, f) |
175 | #define kmalloc_node(s, f, n) kmalloc(s, f) | 176 | #define kmalloc_node(s, f, n) kmalloc(s, f) |
177 | #define ____kmalloc kmalloc | ||
176 | 178 | ||
177 | #endif /* CONFIG_SLOB */ | 179 | #endif /* CONFIG_SLOB */ |
178 | 180 | ||