diff options
| author | Mircea Pop <mircea.pop@nxp.com> | 2019-05-14 17:53:16 +0300 |
|---|---|---|
| committer | Mircea Pop <mircea.pop@nxp.com> | 2019-05-14 17:53:16 +0300 |
| commit | 7957cb421c1a173794267aba480a85cfc71da04f (patch) | |
| tree | a9138a72b8f713cd0ed3457185d93394389ab74c /block | |
| parent | 881e05787ff990126bc2a7de1227662215b48459 (diff) | |
MLK-21526: Revert "block: Unexport elv_register_queue() and elv_unregister_queue()"
This reverts commit 83d016ac86428dbca8a62d3e4fdc29e3ea39e535.
Reverting the patch will solve the issue introduced by MLK-18870 fix
The fix is adding the following patch on 4.14 bsp kernel
83d016ac86428("block: Unexport elv_register_queue()
and elv_unregister_queue()")
The upstream patch that remove the correlation with
export elv_register_queue() is not applied on IMX kernel BSP.
c100ec49fdd22("dm: fix incomplete request_queue initialization")
Having missing patch a compilation issue will be generated if DM is enabled
Decision not to cherry-pick the c100ec49fdd22("dm:fix incomplete
request_queue initialization") from upstream because the patch adds
new DM Crypt functionalities and to revoke the patch that remove the export.
Signed-off-by: Mircea Pop <mircea.pop@nxp.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk.h | 3 | ||||
| -rw-r--r-- | block/elevator.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/block/blk.h b/block/blk.h index 521ea46b6e96..b2c287c2c6a3 100644 --- a/block/blk.h +++ b/block/blk.h @@ -204,9 +204,6 @@ static inline void elv_deactivate_rq(struct request_queue *q, struct request *rq e->type->ops.sq.elevator_deactivate_req_fn(q, rq); } -int elv_register_queue(struct request_queue *q); -void elv_unregister_queue(struct request_queue *q); - struct hd_struct *__disk_get_part(struct gendisk *disk, int partno); #ifdef CONFIG_FAIL_IO_TIMEOUT diff --git a/block/elevator.c b/block/elevator.c index d39315efd510..39d0c6d27916 100644 --- a/block/elevator.c +++ b/block/elevator.c @@ -878,6 +878,7 @@ int elv_register_queue(struct request_queue *q) } return error; } +EXPORT_SYMBOL(elv_register_queue); void elv_unregister_queue(struct request_queue *q) { @@ -893,6 +894,7 @@ void elv_unregister_queue(struct request_queue *q) wbt_enable_default(q); } } +EXPORT_SYMBOL(elv_unregister_queue); int elv_register(struct elevator_type *e) { |