The Kconfig currently controlling compilation of this code is: config BLK_DEV_THROTTLING bool "Block layer bio throttling support"
...meaning that it currently is not being built as a module by anyone. Lets remove the couple traces of modularity so that when reading the code there is no doubt it is builtin-only. Since module_init translates to device_initcall in the non-modular case, the init ordering remains unchanged with this commit. Cc: Vivek Goyal <[email protected]> Cc: Jens Axboe <[email protected]> Signed-off-by: Paul Gortmaker <[email protected]> --- block/blk-throttle.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/block/blk-throttle.c b/block/blk-throttle.c index 2149a1ddbacf..bec1dedf4061 100644 --- a/block/blk-throttle.c +++ b/block/blk-throttle.c @@ -4,7 +4,7 @@ * Copyright (C) 2010 Vivek Goyal <[email protected]> */ -#include <linux/module.h> +#include <linux/init.h> #include <linux/slab.h> #include <linux/blkdev.h> #include <linux/bio.h> @@ -1590,5 +1590,4 @@ static int __init throtl_init(void) return blkcg_policy_register(&blkcg_policy_throtl); } - -module_init(throtl_init); +device_initcall(throtl_init); -- 2.6.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
