From c8269bca8bedd20b06446e6a0f358f66bc240e96 Mon Sep 17 00:00:00 2001
From: Matthew Dobson <colpatch@us.ibm.com>
Date: Sun, 26 Mar 2006 01:37:48 -0800
Subject: [PATCH] --- yaml --- r: 24076 b: refs/heads/master c:
 f183323d3822dee4d7b3147a59b6e8987fe201e0 h: refs/heads/master v: v3

---
 [refs]                        |  2 +-
 trunk/include/linux/mempool.h | 10 ++++++++--
 trunk/mm/mempool.c            |  9 ++++++++-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 8c05039f1c24..3d9136385b17 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0eaae62abaa1ad1f231932b6cdd9fb1b91df6651
+refs/heads/master: f183323d3822dee4d7b3147a59b6e8987fe201e0
diff --git a/trunk/include/linux/mempool.h b/trunk/include/linux/mempool.h
index d23dbf076b57..41570ce353eb 100644
--- a/trunk/include/linux/mempool.h
+++ b/trunk/include/linux/mempool.h
@@ -39,16 +39,22 @@ 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
+ * 2 mempool_alloc_t's and a mempool_free_t to kmalloc/kzalloc and kfree
+ * the amount of memory specified by pool_data
  */
 void *mempool_kmalloc(gfp_t gfp_mask, void *pool_data);
+void *mempool_kzalloc(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);
 }
+static inline mempool_t *mempool_create_kzalloc_pool(int min_nr, size_t size)
+{
+	return mempool_create(min_nr, mempool_kzalloc, mempool_kfree,
+			      (void *) size);
+}
 
 /*
  * A mempool_alloc_t and mempool_free_t for a simple page allocator that
diff --git a/trunk/mm/mempool.c b/trunk/mm/mempool.c
index a1397c6a4864..7bf064e6a345 100644
--- a/trunk/mm/mempool.c
+++ b/trunk/mm/mempool.c
@@ -296,11 +296,18 @@ EXPORT_SYMBOL(mempool_free_slab);
  */
 void *mempool_kmalloc(gfp_t gfp_mask, void *pool_data)
 {
-	size_t size = (size_t) pool_data;
+	size_t size = (size_t)(long)pool_data;
 	return kmalloc(size, gfp_mask);
 }
 EXPORT_SYMBOL(mempool_kmalloc);
 
+void *mempool_kzalloc(gfp_t gfp_mask, void *pool_data)
+{
+	size_t size = (size_t) pool_data;
+	return kzalloc(size, gfp_mask);
+}
+EXPORT_SYMBOL(mempool_kzalloc);
+
 void mempool_kfree(void *element, void *pool_data)
 {
 	kfree(element);