X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=block%2Fmq-deadline.c;h=8eea2cbf2bf4ad1f509dffac7df6b5efb75f7c6d;hb=80ef08670d4c28a06a3de954bd350368780bcfef;hp=04aded71ead2732c7c5c16a8e591c741f84c47c1;hpb=85ebe5aeef9b0bf4c91ff91652b32f9c54f71d34;p=linux-2.6-microblaze.git

diff --git a/block/mq-deadline.c b/block/mq-deadline.c
index 04aded71ead2..8eea2cbf2bf4 100644
--- a/block/mq-deadline.c
+++ b/block/mq-deadline.c
@@ -461,10 +461,9 @@ static int dd_request_merge(struct request_queue *q, struct request **rq,
 	return ELEVATOR_NO_MERGE;
 }
 
-static bool dd_bio_merge(struct blk_mq_hw_ctx *hctx, struct bio *bio,
+static bool dd_bio_merge(struct request_queue *q, struct bio *bio,
 		unsigned int nr_segs)
 {
-	struct request_queue *q = hctx->queue;
 	struct deadline_data *dd = q->elevator->elevator_data;
 	struct request *free = NULL;
 	bool ret;