linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / linux / mempool.h

diff --git a/include/linux/mempool.h b/include/linux/mempool.h
index 9be484d..f2427d7 100644 (file)
--- a/include/linux/mempool.h
+++ b/include/linux/mempool.h
@@ -6,8 +6,6 @@
 
 #include <linux/wait.h>
 
-struct kmem_cache;
-
 typedef void * (mempool_alloc_t)(gfp_t gfp_mask, void *pool_data);
 typedef void (mempool_free_t)(void *element, void *pool_data);
 
@@ -39,41 +37,5 @@ 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);
-static inline mempool_t *
-mempool_create_slab_pool(int min_nr, struct kmem_cache *kc)
-{
-       return mempool_create(min_nr, mempool_alloc_slab, mempool_free_slab,
-                             (void *) kc);
-}
-
-/*
- * 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
- * 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 */