diff options
| author |   Viresh Kumar <viresh.kumar@linaro.org> | 2021-07-01 07:32:37 +0530 |
|---|---|---|
| committer | Viresh Kumar <viresh.kumar@linaro.org> | 2021-07-01 07:32:37 +0530 |
| commit | c503c193db7d7ccc0c58b1ef694eaef331318149 (patch) | |
| tree | 44d3215196f385e88fa5da6affc58649c90e0ea9 /include/linux/elevator.h | |
| parent | dt-bindings: cpufreq: update cpu type and clock name for MT8173 SoC (diff) | |
| parent | cpufreq: CPPC: Add support for frequency invariance (diff) | |
Merge branch 'cpufreq/cppc-fie' into cpufreq/arm/linux-next
Diffstat (limited to 'include/linux/elevator.h')
| -rw-r--r-- | include/linux/elevator.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/elevator.h b/include/linux/elevator.h index 1fe8e105b83b..dcb2f9022c1d 100644 --- a/include/linux/elevator.h +++ b/include/linux/elevator.h @@ -34,7 +34,7 @@ struct elevator_mq_ops { void (*depth_updated)(struct blk_mq_hw_ctx *); bool (*allow_merge)(struct request_queue *, struct request *, struct bio *); - bool (*bio_merge)(struct blk_mq_hw_ctx *, struct bio *, unsigned int); + bool (*bio_merge)(struct request_queue *, struct bio *, unsigned int); int (*request_merge)(struct request_queue *q, struct request **, struct bio *); void (*request_merged)(struct request_queue *, struct request *, enum elv_merge); void (*requests_merged)(struct request_queue *, struct request *, struct request *); |