2014-06-10 18:06:17

by Fabian Frédérick

Subject: [PATCH 1/1] BLOCK/ELEVATOR: add __init to elv_register

elv_register is only called by elevator init functions:

__init cfq_init
__init deadline_init
__init noop_init

Cc: Jens Axboe <[email protected]>
Cc: Andrew Morton <[email protected]>
Signed-off-by: Fabian Frederick <[email protected]>
---
block/elevator.c | 2 +-
include/linux/elevator.h | 2 +-
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 *);

/*
--
1.8.4.5

2014-06-10 19:13:37

by Jens Axboe

Subject: Re: [PATCH 1/1] BLOCK/ELEVATOR: add __init to elv_register

On 06/10/2014 12:04 PM, Fabian Frederick wrote:
> elv_register is only called by elevator init functions:
>
> __init cfq_init
> __init deadline_init
> __init noop_init

Thanks, applied.

--
Jens Axboe