diff options
| author | Pekka Enberg <penberg@kernel.org> | 2012-10-03 09:56:12 +0300 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2012-10-03 09:56:12 +0300 |
| commit | 023dc70470502f41b285112d4840f35d9075b767 (patch) | |
| tree | f2f06d54be9583d9b1b2abae4c76722c5453df83 /include/linux/slab.h | |
| parent | a0d271cbfed1dd50278c6b06bead3d00ba0a88f9 (diff) | |
| parent | 608da7e3fc7259eca0d983b31bc8915af14cf15e (diff) | |
| download | op-kernel-dev-023dc70470502f41b285112d4840f35d9075b767.zip op-kernel-dev-023dc70470502f41b285112d4840f35d9075b767.tar.gz | |
Merge branch 'slab/next' into slab/for-linus
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 0dd2dfa..83d1a14 100644 --- 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, \ |
