diff options
author | Tejun Heo <tj@kernel.org> | 2012-06-04 20:40:53 -0700 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2012-06-25 11:53:47 +0200 |
commit | a91a5ac6858fbf7477131e1210cb3e897b668e6f (patch) | |
tree | 01ff0eff5088efc3459cf139e349414e35068493 /include/linux | |
parent | 159749937a3e1605068a454b1607cdc5714f16e6 (diff) | |
download | linux-stable-a91a5ac6858fbf7477131e1210cb3e897b668e6f.tar.gz linux-stable-a91a5ac6858fbf7477131e1210cb3e897b668e6f.tar.bz2 linux-stable-a91a5ac6858fbf7477131e1210cb3e897b668e6f.zip |
mempool: add @gfp_mask to mempool_create_node()
mempool_create_node() currently assumes %GFP_KERNEL. Its only user,
blk_init_free_list(), is about to be updated to use other allocation
flags - add @gfp_mask argument to the function.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Hugh Dickins <hughd@google.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/mempool.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/mempool.h b/include/linux/mempool.h index 7c08052e3321..39ed62ab5b8a 100644 --- a/include/linux/mempool.h +++ b/include/linux/mempool.h @@ -26,7 +26,8 @@ typedef struct mempool_s { extern mempool_t *mempool_create(int min_nr, mempool_alloc_t *alloc_fn, mempool_free_t *free_fn, void *pool_data); extern mempool_t *mempool_create_node(int min_nr, mempool_alloc_t *alloc_fn, - mempool_free_t *free_fn, void *pool_data, int nid); + mempool_free_t *free_fn, void *pool_data, + gfp_t gfp_mask, int nid); extern int mempool_resize(mempool_t *pool, int new_min_nr, gfp_t gfp_mask); extern void mempool_destroy(mempool_t *pool); |