block: add __init to elv_register

elv_register is only called by elevator init functions:

__init cfq_init
__init deadline_init
__init noop_init

Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Jens Axboe <axboe@fb.com>

diff --git a/block/elevator.c b/block/elevator.c
index 1e01b66a0b927018498c8d28d5b09472cbf559ce..f35edddfe9b5421e38e39d8e9e9a43e61e7ca2f4 100644 (file)
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -845,7 +845,7 @@ void elv_unregister_queue(struct request_queue *q)
 }
 EXPORT_SYMBOL(elv_unregister_queue);
 
-int elv_register(struct elevator_type *e)
+int __init elv_register(struct elevator_type *e)
 {
        char *def = "";
 

diff --git a/include/linux/elevator.h b/include/linux/elevator.h
index df63bd3a8cf155e29310b8fcfd1bbc746119c536..4ff262e2bf3767bfe0ce456914ee856837f9ac59 100644 (file)
--- a/include/linux/elevator.h
+++ b/include/linux/elevator.h
@@ -144,7 +144,7 @@ extern void elv_drain_elevator(struct request_queue *);
  * io scheduler registration
  */
 extern void __init load_default_elevator_module(void);
-extern int elv_register(struct elevator_type *);
+extern int __init elv_register(struct elevator_type *);
 extern void elv_unregister(struct elevator_type *);
 
 /*