memcg: oom kill disable and oom status

[safe/jmp/linux-2.6] / mm / mempool.c

diff --git a/mm/mempool.c b/mm/mempool.c
index 02d5ec3..1a3bc3d 100644 (file)
--- a/mm/mempool.c
+++ b/mm/mempool.c
@@ -299,22 +299,15 @@ EXPORT_SYMBOL(mempool_free_slab);
 
 /*
  * A commonly used alloc and free fn that kmalloc/kfrees the amount of memory
- * specfied by pool_data
+ * specified by pool_data
  */
 void *mempool_kmalloc(gfp_t gfp_mask, void *pool_data)
 {
-       size_t size = (size_t)(long)pool_data;
+       size_t size = (size_t)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);