diff options
| author | Jens Axboe <axboe@fb.com> | 2014-05-28 09:50:26 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-05-28 09:50:26 -0600 |
| commit | 6178976500ae61fa7b12ebb2d3de816dc9396388 (patch) | |
| tree | 143df1479f56458801b676d038e6a7157a472981 /drivers/block/mtip32xx | |
| parent | 6314a108ec19aefa5160535b2bfe1ca9c38efe37 (diff) | |
| parent | d852564f8c88b0604490234fdeeb6fb47e4bcc7a (diff) | |
Merge branch 'for-3.16/core' into for-3.16/drivers
mtip32xx uses blk_mq_alloc_reserved_request(), so pull in the
core changes so we have a properly merged end result.
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/block/mtip32xx')
| -rw-r--r-- | drivers/block/mtip32xx/mtip32xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c index ae331ab4a451..ea323e91903b 100644 --- a/drivers/block/mtip32xx/mtip32xx.c +++ b/drivers/block/mtip32xx/mtip32xx.c @@ -178,7 +178,7 @@ static struct mtip_cmd *mtip_get_int_command(struct driver_data *dd) { struct request *rq; - rq = blk_mq_alloc_reserved_request(dd->queue, 0, __GFP_WAIT); + rq = blk_mq_alloc_request(dd->queue, 0, __GFP_WAIT, true); return blk_mq_rq_to_pdu(rq); } |