summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Axboe <axboe@fb.com>2014-06-23 02:32:48 +0400
committerJens Axboe <axboe@fb.com>2014-06-23 02:34:11 +0400
commite567bf7112518824830978d644dfb5a991e67d54 (patch)
treec049e11e12b33283bff3e952d60541d8a3c980a9
parentd5bf02914ea3ecf28db4f830f136dc04146b2317 (diff)
downloadlinux-e567bf7112518824830978d644dfb5a991e67d54.tar.xz
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.c2
-rw-r--r--include/linux/elevator.h2
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)
}
EXPORT_SYMBOL(elv_unregister_queue);
-int __init elv_register(struct elevator_type *e)
+int elv_register(struct elevator_type *e)
{
char *def = "";
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 *);
* io scheduler registration
*/
extern void __init load_default_elevator_module(void);
-extern int __init elv_register(struct elevator_type *);
+extern int elv_register(struct elevator_type *);
extern void elv_unregister(struct elevator_type *);
/*