Skip to content

Commit

Permalink
Revert "block: add __init to elv_register"
Browse files Browse the repository at this point in the history
This reverts commit b5097e9.

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>
  • Loading branch information
axboe committed Jun 22, 2014
1 parent d5bf029 commit e567bf7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion block/elevator.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "";

Expand Down
2 changes: 1 addition & 1 deletion include/linux/elevator.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 *);

/*
Expand Down

0 comments on commit e567bf7

Please sign in to comment.