xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'for-3.16/core' into for-3.16/drivers

Browse Source 
Pulled in for the blk_mq_tag_to_rq() change, which impacts
mtip32xx.

Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
Jens Axboe
2014-05-30 08:11:50 -06:00
parent 879466e6a5 2230237500
commit f89ca16646
8 changed files with 49 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/block/mtip32xx/mtip32xx.c
View File

@@ -193,9 +193,7 @@ static void mtip_put_int_command(struct driver_data *dd, struct mtip_cmd *cmd)
static struct request *mtip_rq_from_tag(struct driver_data *dd,
unsigned int tag)
{
struct blk_mq_hw_ctx *hctx = dd->queue->queue_hw_ctx[0];
return blk_mq_tag_to_rq(hctx->tags, tag);
return blk_mq_tag_to_rq(dd->queue->queue_hw_ctx[0], tag);
}
static struct mtip_cmd *mtip_cmd_from_tag(struct driver_data *dd,