diff options
author | Fabian Frederick <fabf@skynet.be> | 2014-06-10 14:04:50 -0400 |
---|---|---|
committer | Jens Axboe <axboe@fb.com> | 2014-06-10 15:13:11 -0400 |
commit | b5097e956a4d2919ee248d6481e4204c5568ed5c (patch) | |
tree | cbe963a2fdac6835e79079165de6d9044cb351bb | |
parent | 58a4915ad2f8a87f4456aac260396df7e300e6f2 (diff) |
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>
-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 1e01b66a0b92..f35edddfe9b5 100644 --- a/block/elevator.c +++ b/block/elevator.c | |||
@@ -845,7 +845,7 @@ void elv_unregister_queue(struct request_queue *q) | |||
845 | } | 845 | } |
846 | EXPORT_SYMBOL(elv_unregister_queue); | 846 | EXPORT_SYMBOL(elv_unregister_queue); |
847 | 847 | ||
848 | int elv_register(struct elevator_type *e) | 848 | int __init elv_register(struct elevator_type *e) |
849 | { | 849 | { |
850 | char *def = ""; | 850 | char *def = ""; |
851 | 851 | ||
diff --git a/include/linux/elevator.h b/include/linux/elevator.h index df63bd3a8cf1..4ff262e2bf37 100644 --- a/include/linux/elevator.h +++ b/include/linux/elevator.h | |||
@@ -144,7 +144,7 @@ extern void elv_drain_elevator(struct request_queue *); | |||
144 | * io scheduler registration | 144 | * io scheduler registration |
145 | */ | 145 | */ |
146 | extern void __init load_default_elevator_module(void); | 146 | extern void __init load_default_elevator_module(void); |
147 | extern int elv_register(struct elevator_type *); | 147 | extern int __init elv_register(struct elevator_type *); |
148 | extern void elv_unregister(struct elevator_type *); | 148 | extern void elv_unregister(struct elevator_type *); |
149 | 149 | ||
150 | /* | 150 | /* |