summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2014-06-10 20:04:50 +0200
committerJens Axboe <axboe@fb.com>2014-06-10 13:13:11 -0600
commitb5097e956a4d2919ee248d6481e4204c5568ed5c (patch)
treecbe963a2fdac6835e79079165de6d9044cb351bb
parent58a4915ad2f8a87f4456aac260396df7e300e6f2 (diff)
downloadlinux-0-day-b5097e956a4d2919ee248d6481e4204c5568ed5c.tar.gz
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.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 1e01b66..f35eddd 100644
--- 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 df63bd3..4ff262e 100644
--- 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 *);
/*