Revert "block: add __init to elv_register"

This reverts commit e3e0026f7bbad39845b7ab4a4d112e3a6a2eddcc.

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>

diff --git a/block/elevator.c b/block/elevator.c
index 34bded18910e74f73754b9584361deba40611682..24c28b659bb34f00eae0e4b900266e1dca069169 100644 (file)
--- 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 e2a6bd7fb13380bfa4b0d14251b8a64908f8b0f1..45a91474487daff11a69bf55a31d7cd146c75f72 100644 (file)
--- 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 *);
 
 /*