diff options
| author | Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro> | 2008-08-10 20:14:07 +0300 |
|---|---|---|
| committer | Pekka Enberg <penberg@cs.helsinki.fi> | 2008-12-29 15:34:05 +0200 |
| commit | 3eae2cb24a96509e0a38cc48dc1538a2826f4e33 (patch) | |
| tree | d59f2c69d8b377c12222deba8b07d065ade73818 /include/linux/slob_def.h | |
| parent | 36555751c6751a5bdfd6d7bdf0648343bb1ef0de (diff) | |
| download | kernel-common-3eae2cb24a96509e0a38cc48dc1538a2826f4e33.tar.gz kernel-common-3eae2cb24a96509e0a38cc48dc1538a2826f4e33.tar.bz2 kernel-common-3eae2cb24a96509e0a38cc48dc1538a2826f4e33.zip | |
kmemtrace: SLOB hooks.
This adds hooks for the SLOB allocator, to allow tracing with kmemtrace.
We also convert some inline functions to __always_inline to make sure
_RET_IP_, which expands to __builtin_return_address(0), always works
as expected.
Acked-by: Matt Mackall <mpm@selenic.com>
Signed-off-by: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Diffstat (limited to 'include/linux/slob_def.h')
| -rw-r--r-- | include/linux/slob_def.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/linux/slob_def.h b/include/linux/slob_def.h index 59a3fa476ab9..0ec00b39d006 100644 --- a/include/linux/slob_def.h +++ b/include/linux/slob_def.h @@ -3,14 +3,15 @@ void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node); -static inline void *kmem_cache_alloc(struct kmem_cache *cachep, gfp_t flags) +static __always_inline void *kmem_cache_alloc(struct kmem_cache *cachep, + gfp_t flags) { return kmem_cache_alloc_node(cachep, flags, -1); } void *__kmalloc_node(size_t size, gfp_t flags, int node); -static inline void *kmalloc_node(size_t size, gfp_t flags, int node) +static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node) { return __kmalloc_node(size, flags, node); } @@ -23,12 +24,12 @@ static inline void *kmalloc_node(size_t size, gfp_t flags, int node) * kmalloc is the normal method of allocating memory * in the kernel. */ -static inline void *kmalloc(size_t size, gfp_t flags) +static __always_inline void *kmalloc(size_t size, gfp_t flags) { return __kmalloc_node(size, flags, -1); } -static inline void *__kmalloc(size_t size, gfp_t flags) +static __always_inline void *__kmalloc(size_t size, gfp_t flags) { return kmalloc(size, flags); } |