diff --git a/[refs] b/[refs] index 08db9ee51c46..2aa91615bac7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1392e3b33319fd1a2527bebfc56631c2f2d3c7c5 +refs/heads/master: 5e2f89b5d5d87a7c3ba19fc85ba0c29adb65f639 diff --git a/trunk/mm/mempool.c b/trunk/mm/mempool.c index a46eb1b4bb66..32e75d400503 100644 --- a/trunk/mm/mempool.c +++ b/trunk/mm/mempool.c @@ -303,14 +303,14 @@ EXPORT_SYMBOL(mempool_free_slab); */ 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; + size_t size = (size_t)pool_data; return kzalloc(size, gfp_mask); } EXPORT_SYMBOL(mempool_kzalloc);