summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Dobson <colpatch@us.ibm.com>2006-03-26 13:37:44 +0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-26 20:56:59 +0400
commit6e0678f394c7bd21bfa5d252b071a09e10e7a749 (patch)
tree45e9729c67b867821748414667dada0d36a8bd34
parent8219dd5710c1daec2d7a086eeeee5187decfde60 (diff)
downloadlinux-6e0678f394c7bd21bfa5d252b071a09e10e7a749.tar.xz
[PATCH] mempool: add page allocator
This will be used by the next patch in the series to replace duplicate mempool-backed page allocators in 2 places in the kernel. It is also 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.c18
2 files changed, 30 insertions, 0 deletions
diff --git a/include/linux/mempool.h b/include/linux/mempool.h
index f2427d7394b0..9787572e0ae7 100644
--- a/include/linux/mempool.h
+++ b/include/linux/mempool.h
@@ -38,4 +38,16 @@ extern void mempool_free(void *element, mempool_t *pool);
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 for a simple page allocator that
+ * allocates pages of the order specified by pool_data
+ */
+void *mempool_alloc_pages(gfp_t gfp_mask, void *pool_data);
+void mempool_free_pages(void *element, void *pool_data);
+static inline mempool_t *mempool_create_page_pool(int min_nr, int order)
+{
+ return mempool_create(min_nr, mempool_alloc_pages, mempool_free_pages,
+ (void *)(long)order);
+}
+
#endif /* _LINUX_MEMPOOL_H */
diff --git a/mm/mempool.c b/mm/mempool.c
index f71893ed3543..45c0112ca7b2 100644
--- a/mm/mempool.c
+++ b/mm/mempool.c
@@ -289,3 +289,21 @@ void mempool_free_slab(void *element, void *pool_data)
kmem_cache_free(mem, element);
}
EXPORT_SYMBOL(mempool_free_slab);
+
+/*
+ * A simple mempool-backed page allocator that allocates pages
+ * of the order specified by pool_data.
+ */
+void *mempool_alloc_pages(gfp_t gfp_mask, void *pool_data)
+{
+ int order = (int)(long)pool_data;
+ return alloc_pages(gfp_mask, order);
+}
+EXPORT_SYMBOL(mempool_alloc_pages);
+
+void mempool_free_pages(void *element, void *pool_data)
+{
+ int order = (int)(long)pool_data;
+ __free_pages(element, order);
+}
+EXPORT_SYMBOL(mempool_free_pages);