From 140e54dbc469c42323ee606c52310c1a4d0c2a3c Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Mon, 21 Sep 2009 17:02:56 -0700
Subject: [PATCH] --- yaml --- r: 164444 b: refs/heads/master c:
 bba78819548a59a52e60f0b259997bbd011164ae h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 1ee528dea9a4..c4556af549b4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bbba809e96539672f775a3d70102657d05816a5b
+refs/heads/master: bba78819548a59a52e60f0b259997bbd011164ae
diff --git a/trunk/include/linux/mempool.h b/trunk/include/linux/mempool.h
index 9be484d11283..7c08052e3321 100644
--- a/trunk/include/linux/mempool.h
+++ b/trunk/include/linux/mempool.h
@@ -47,22 +47,16 @@ mempool_create_slab_pool(int min_nr, struct kmem_cache *kc)
 }
 
 /*
- * 2 mempool_alloc_t's and a mempool_free_t to kmalloc/kzalloc and kfree
- * the amount of memory specified by pool_data
+ * a mempool_alloc_t and a mempool_free_t to kmalloc 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 32e75d400503..1a3bc3d4d554 100644
--- a/trunk/mm/mempool.c
+++ b/trunk/mm/mempool.c
@@ -308,13 +308,6 @@ void *mempool_kmalloc(gfp_t gfp_mask, void *pool_data)
 }
 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);