diff options
author | Christoph Lameter <cl@linux.com> | 2013-01-10 19:00:53 +0000 |
---|---|---|
committer | Pekka Enberg <penberg@kernel.org> | 2013-02-01 12:32:05 +0200 |
commit | 345046673449b5c35840e5cc34a60059cbec9305 (patch) | |
tree | 2543b0f190fabaaf91b35a9c4f251735ae9ddb52 /include/linux/slab.h | |
parent | 31ba7346f082f3468b8e06b45db475a6e25f01fc (diff) | |
download | linux-stable-345046673449b5c35840e5cc34a60059cbec9305.tar.gz linux-stable-345046673449b5c35840e5cc34a60059cbec9305.tar.bz2 linux-stable-345046673449b5c35840e5cc34a60059cbec9305.zip |
slab: Move kmalloc related function defs
Move these functions higher up in slab.h so that they are grouped with other
generic kmalloc related definitions.
Acked-by: Glauber Costa <glommer@parallels.com>
Signed-off-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Diffstat (limited to 'include/linux/slab.h')
-rw-r--r-- | include/linux/slab.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/include/linux/slab.h b/include/linux/slab.h index 5d168d7e0a28..ccbb37685c6c 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h @@ -148,6 +148,15 @@ void kmem_cache_free(struct kmem_cache *, void *); (__flags), NULL) /* + * Common kmalloc functions provided by all allocators + */ +void * __must_check __krealloc(const void *, size_t, gfp_t); +void * __must_check krealloc(const void *, size_t, gfp_t); +void kfree(const void *); +void kzfree(const void *); +size_t ksize(const void *); + +/* * The largest kmalloc size supported by the slab allocators is * 32 megabyte (2^25) or the maximum allocatable page order if that is * less than 32 MB. @@ -225,15 +234,6 @@ int cache_show(struct kmem_cache *s, struct seq_file *m); void print_slabinfo_header(struct seq_file *m); /* - * Common kmalloc functions provided by all allocators - */ -void * __must_check __krealloc(const void *, size_t, gfp_t); -void * __must_check krealloc(const void *, size_t, gfp_t); -void kfree(const void *); -void kzfree(const void *); -size_t ksize(const void *); - -/* * Allocator specific definitions. These are mainly used to establish optimized * ways to convert kmalloc() calls to kmem_cache_alloc() invocations by * selecting the appropriate general cache at compile time. |