aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Lameter <cl@linux.com>2013-01-10 14:00:53 -0500
committerPekka Enberg <penberg@kernel.org>2013-02-01 05:32:05 -0500
commit345046673449b5c35840e5cc34a60059cbec9305 (patch)
tree2543b0f190fabaaf91b35a9c4f251735ae9ddb52
parent31ba7346f082f3468b8e06b45db475a6e25f01fc (diff)
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>
-rw-r--r--include/linux/slab.h18
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 *);
148 (__flags), NULL) 148 (__flags), NULL)
149 149
150/* 150/*
151 * Common kmalloc functions provided by all allocators
152 */
153void * __must_check __krealloc(const void *, size_t, gfp_t);
154void * __must_check krealloc(const void *, size_t, gfp_t);
155void kfree(const void *);
156void kzfree(const void *);
157size_t ksize(const void *);
158
159/*
151 * The largest kmalloc size supported by the slab allocators is 160 * The largest kmalloc size supported by the slab allocators is
152 * 32 megabyte (2^25) or the maximum allocatable page order if that is 161 * 32 megabyte (2^25) or the maximum allocatable page order if that is
153 * less than 32 MB. 162 * less than 32 MB.
@@ -225,15 +234,6 @@ int cache_show(struct kmem_cache *s, struct seq_file *m);
225void print_slabinfo_header(struct seq_file *m); 234void print_slabinfo_header(struct seq_file *m);
226 235
227/* 236/*
228 * Common kmalloc functions provided by all allocators
229 */
230void * __must_check __krealloc(const void *, size_t, gfp_t);
231void * __must_check krealloc(const void *, size_t, gfp_t);
232void kfree(const void *);
233void kzfree(const void *);
234size_t ksize(const void *);
235
236/*
237 * Allocator specific definitions. These are mainly used to establish optimized 237 * Allocator specific definitions. These are mainly used to establish optimized
238 * ways to convert kmalloc() calls to kmem_cache_alloc() invocations by 238 * ways to convert kmalloc() calls to kmem_cache_alloc() invocations by
239 * selecting the appropriate general cache at compile time. 239 * selecting the appropriate general cache at compile time.