Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211

[firefly-linux-kernel-4.4.55.git] / include / linux / slab.h

diff --git a/include/linux/slab.h b/include/linux/slab.h
index 0dd2dfa7becadd196849e0d9ff003a7dcd7f9b45..83d1a1454b7edea3bc32e91fc4b03b58e52af474 100644 (file)
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -321,7 +321,8 @@ static inline void *kmem_cache_alloc_node(struct kmem_cache *cachep,
  * request comes from.
  */
 #if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_SLUB) || \
-       (defined(CONFIG_SLAB) && defined(CONFIG_TRACING))
+       (defined(CONFIG_SLAB) && defined(CONFIG_TRACING)) || \
+       (defined(CONFIG_SLOB) && defined(CONFIG_TRACING))
 extern void *__kmalloc_track_caller(size_t, gfp_t, unsigned long);
 #define kmalloc_track_caller(size, flags) \
        __kmalloc_track_caller(size, flags, _RET_IP_)
@@ -340,7 +341,8 @@ extern void *__kmalloc_track_caller(size_t, gfp_t, unsigned long);
  * allocation request comes from.
  */
 #if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_SLUB) || \
-       (defined(CONFIG_SLAB) && defined(CONFIG_TRACING))
+       (defined(CONFIG_SLAB) && defined(CONFIG_TRACING)) || \
+       (defined(CONFIG_SLOB) && defined(CONFIG_TRACING))
 extern void *__kmalloc_node_track_caller(size_t, gfp_t, int, unsigned long);
 #define kmalloc_node_track_caller(size, flags, node) \
        __kmalloc_node_track_caller(size, flags, node, \