The Makefile currently controlling compilation of this code is obj-y 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. However one could argue that subsys_initcall() might make more sense here. Cc: Christoph Lameter <[email protected]> Cc: Pekka Enberg <[email protected]> Cc: David Rientjes <[email protected]> Cc: Joonsoo Kim <[email protected]> Cc: Andrew Morton <[email protected]> Cc: [email protected] Signed-off-by: Paul Gortmaker <[email protected]> --- mm/slab_common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/slab_common.c b/mm/slab_common.c index 5ce4faeb16fb..a27aff8d7cdc 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c @@ -10,7 +10,7 @@ #include <linux/interrupt.h> #include <linux/memory.h> #include <linux/compiler.h> -#include <linux/module.h> +#include <linux/init.h> #include <linux/cpu.h> #include <linux/uaccess.h> #include <linux/seq_file.h> @@ -1113,7 +1113,7 @@ static int __init slab_proc_init(void) &proc_slabinfo_operations); return 0; } -module_init(slab_proc_init); +device_initcall(slab_proc_init); #endif /* CONFIG_SLABINFO */ static __always_inline void *__do_krealloc(const void *p, size_t new_size, -- 2.5.0 -- 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/
