diff options
author | Jens Axboe <axboe@fb.com> | 2014-06-22 18:32:48 -0400 |
---|---|---|
committer | Jens Axboe <axboe@fb.com> | 2014-06-22 18:34:11 -0400 |
commit | e567bf7112518824830978d644dfb5a991e67d54 (patch) | |
tree | c049e11e12b33283bff3e952d60541d8a3c980a9 | |
parent | d5bf02914ea3ecf28db4f830f136dc04146b2317 (diff) |
Revert "block: add __init to elv_register"
This reverts commit b5097e956a4d2919ee248d6481e4204c5568ed5c.
The original commit is buggy, we do use the registration functions
at runtime, for instance when loading IO schedulers through sysfs.
Reported-by: Damien Wyart <damien.wyart@gmail.com>
-rw-r--r-- | block/elevator.c | 2 | ||||
-rw-r--r-- | include/linux/elevator.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/block/elevator.c b/block/elevator.c index 34bded18910e..24c28b659bb3 100644 --- a/block/elevator.c +++ b/block/elevator.c | |||
@@ -825,7 +825,7 @@ void elv_unregister_queue(struct request_queue *q) | |||
825 | } | 825 | } |
826 | EXPORT_SYMBOL(elv_unregister_queue); | 826 | EXPORT_SYMBOL(elv_unregister_queue); |
827 | 827 | ||
828 | int __init elv_register(struct elevator_type *e) | 828 | int elv_register(struct elevator_type *e) |
829 | { | 829 | { |
830 | char *def = ""; | 830 | char *def = ""; |
831 | 831 | ||
diff --git a/include/linux/elevator.h b/include/linux/elevator.h index e2a6bd7fb133..45a91474487d 100644 --- a/include/linux/elevator.h +++ b/include/linux/elevator.h | |||
@@ -143,7 +143,7 @@ extern void elv_drain_elevator(struct request_queue *); | |||
143 | * io scheduler registration | 143 | * io scheduler registration |
144 | */ | 144 | */ |
145 | extern void __init load_default_elevator_module(void); | 145 | extern void __init load_default_elevator_module(void); |
146 | extern int __init elv_register(struct elevator_type *); | 146 | extern int elv_register(struct elevator_type *); |
147 | extern void elv_unregister(struct elevator_type *); | 147 | extern void elv_unregister(struct elevator_type *); |
148 | 148 | ||
149 | /* | 149 | /* |