Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...

[linux-2.6] / mm / mempool.c

diff --git a/mm/mempool.c b/mm/mempool.c
index 1a99b80480d3da562117c14db409149abdfd7e61..f71893ed354358fcf2c6dcfc576a7a7730852cc6 100644 (file)
--- a/mm/mempool.c
+++ b/mm/mempool.c
@@ -278,14 +278,14 @@ EXPORT_SYMBOL(mempool_free);
  */
 void *mempool_alloc_slab(gfp_t gfp_mask, void *pool_data)
 {
-       kmem_cache_t *mem = (kmem_cache_t *) pool_data;
+       struct kmem_cache *mem = pool_data;
        return kmem_cache_alloc(mem, gfp_mask);
 }
 EXPORT_SYMBOL(mempool_alloc_slab);
 
 void mempool_free_slab(void *element, void *pool_data)
 {
-       kmem_cache_t *mem = (kmem_cache_t *) pool_data;
+       struct kmem_cache *mem = pool_data;
        kmem_cache_free(mem, element);
 }
 EXPORT_SYMBOL(mempool_free_slab);