diff options
| author | Ingo Molnar | 2014-02-27 12:41:17 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2014-02-27 12:41:17 +0100 |
| commit | ff5a7088f0f04dd246e514f898cab0c863c3598d (patch) | |
| tree | 68a8f588e60fba05ee54b74b32a3269a72d130b9 /block/blk-mq.h | |
| parent | 7e74efcf76c16f851df5c838c143c4a1865ea9fa (diff) | |
| parent | e3703f8cdfcf39c25c4338c3ad8e68891cca3731 (diff) | |
Merge branch 'perf/urgent' into perf/core
Merge the latest fixes before queueing up new changes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'block/blk-mq.h')
| -rw-r--r-- | block/blk-mq.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block/blk-mq.h b/block/blk-mq.h index 5c3917984b00..ed0035cd458e 100644 --- a/block/blk-mq.h +++ b/block/blk-mq.h @@ -22,13 +22,13 @@ struct blk_mq_ctx { struct kobject kobj; }; -void __blk_mq_end_io(struct request *rq, int error); -void blk_mq_complete_request(struct request *rq, int error); +void __blk_mq_complete_request(struct request *rq); void blk_mq_run_request(struct request *rq, bool run_queue, bool async); void blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx, bool async); void blk_mq_init_flush(struct request_queue *q); void blk_mq_drain_queue(struct request_queue *q); void blk_mq_free_queue(struct request_queue *q); +void blk_mq_rq_init(struct blk_mq_hw_ctx *hctx, struct request *rq); /* * CPU hotplug helpers |