Merge branch 'for-3.9/core' of git://git.kernel.dk/linux-block

[firefly-linux-kernel-4.4.55.git] / include / linux / elevator.h

diff --git a/include/linux/elevator.h b/include/linux/elevator.h
index 7c5a7c9789ee63f17c1ece383679433412b4e678..acd0312d46fb13d0a2752ea49add626a1a9411d8 100644 (file)
--- a/include/linux/elevator.h
+++ b/include/linux/elevator.h
@@ -141,6 +141,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 void elv_unregister(struct elevator_type *);
 
@@ -209,5 +210,9 @@ enum {
        INIT_LIST_HEAD(&(rq)->csd.list);        \
        } while (0)
 
+#else /* CONFIG_BLOCK */
+
+static inline void load_default_elevator_module(void) { }
+
 #endif /* CONFIG_BLOCK */
 #endif