summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Dobson <colpatch@us.ibm.com>2006-03-26 01:37:46 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-26 08:56:59 -0800
commit53184082b070dfb077218828fdf839826102ed96 (patch)
tree77aad868cb43b78195e7ca657c1e30a6934fac44
parenta19b27ce3847c3a5d4ea6b6c91b6f7154759af23 (diff)
downloadlwn-53184082b070dfb077218828fdf839826102ed96.tar.gz
lwn-53184082b070dfb077218828fdf839826102ed96.zip
[PATCH] mempool: add kmalloc allocator
Add another allocator to the common mempool code: a kmalloc/kfree allocator This will be used by the next patch in the series to replace duplicate mempool-backed kmalloc allocators in several places in the kernel. It is also very likely that there will be more users in the future. Signed-off-by: Matthew Dobson <colpatch@us.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--include/linux/mempool.h12
-rw-r--r--mm/mempool.c17
2 files changed, 29 insertions, 0 deletions
diff --git a/include/linux/mempool.h b/include/linux/mempool.h
index 9787572e0ae7..d23dbf076b57 100644
--- a/include/linux/mempool.h
+++ b/include/linux/mempool.h
@@ -39,6 +39,18 @@ void *mempool_alloc_slab(gfp_t gfp_mask, void *pool_data);
void mempool_free_slab(void *element, void *pool_data);
/*
+ * A mempool_alloc_t and mempool_free_t to kmalloc the amount of memory
+ * specified by pool_data
+ */
+void *mempool_kmalloc(gfp_t gfp_mask, void *pool_data);
+void mempool_kfree(void *element, void *pool_data);
+static inline mempool_t *mempool_create_kmalloc_pool(int min_nr, size_t size)
+{
+ return mempool_create(min_nr, mempool_kmalloc, mempool_kfree,
+ (void *) size);
+}
+
+/*
* A mempool_alloc_t and mempool_free_t for a simple page allocator that
* allocates pages of the order specified by pool_data
*/
diff --git a/mm/mempool.c b/mm/mempool.c
index 45c0112ca7b2..a1397c6a4864 100644
--- a/mm/mempool.c
+++ b/mm/mempool.c
@@ -291,6 +291,23 @@ void mempool_free_slab(void *element, void *pool_data)
EXPORT_SYMBOL(mempool_free_slab);
/*
+ * A commonly used alloc and free fn that kmalloc/kfrees the amount of memory
+ * specfied by pool_data
+ */
+void *mempool_kmalloc(gfp_t gfp_mask, void *pool_data)
+{
+ size_t size = (size_t) pool_data;
+ return kmalloc(size, gfp_mask);
+}
+EXPORT_SYMBOL(mempool_kmalloc);
+
+void mempool_kfree(void *element, void *pool_data)
+{
+ kfree(element);
+}
+EXPORT_SYMBOL(mempool_kfree);
+
+/*
* A simple mempool-backed page allocator that allocates pages
* of the order specified by pool_data.
*/