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 <cl@xxxxxxxxx> Cc: Pekka Enberg <penberg@xxxxxxxxxx> Cc: David Rientjes <rientjes@xxxxxxxxxx> Cc: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx> Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Cc: linux-mm@xxxxxxxxx Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx> --- 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, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxx. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>