[<prev] [next>] [day] [month] [year] [list]
Message-Id: <1403351232-5854-1-git-send-email-fabf@skynet.be>
Date: Sat, 21 Jun 2014 13:47:12 +0200
From: Fabian Frederick <fabf@...net.be>
To: linux-kernel@...r.kernel.org
Cc: Fabian Frederick <fabf@...net.be>,
Damien Wyart <damien.wyart@...il.com>,
Jens Axboe <axboe@...com>
Subject: [PATCH 1/1] Revert "block: add __init to elv_register"
This reverts commit b5097e956a4d
Adding __init to elv_register makes it unreliable when updating
/sys/block/sdX/queue/scheduler at runtime
Reported-by: Damien Wyart <damien.wyart@...il.com>
Cc: Damien Wyart <damien.wyart@...il.com>
Cc: Jens Axboe <axboe@...com>
Signed-off-by: Fabian Frederick <fabf@...net.be>
---
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 34bded1..24c28b6 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -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 = "";
diff --git a/include/linux/elevator.h b/include/linux/elevator.h
index e2a6bd7..45a9147 100644
--- a/include/linux/elevator.h
+++ b/include/linux/elevator.h
@@ -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 *);
/*
--
1.8.4.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists