Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e567bf71 authored Jun 22, 2014 by Jens Axboe

Revert "block: add __init to elv_register"



This reverts commit b5097e95.

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>

parent d5bf0291

block/elevator.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -825,7 +825,7 @@ void elv_unregister_queue(struct request_queue *q)
	}		}
	EXPORT_SYMBOL(elv_unregister_queue);		EXPORT_SYMBOL(elv_unregister_queue);

	int __init elv_register(struct elevator_type *e)		int elv_register(struct elevator_type *e)
	{		{
	char *def = "";		char *def = "";

include/linux/elevator.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -143,7 +143,7 @@ extern void elv_drain_elevator(struct request_queue *);
	* io scheduler registration		* io scheduler registration
	*/		*/
	extern void __init load_default_elevator_module(void);		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 *);		extern void elv_unregister(struct elevator_type *);

	/*		/*