Skip to contentSkip to conversation

x86: don't use module_init for non-modular core bootflag code

PATCH New Paul Gortmaker 1 participant 1 message Jan 12, 2014 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86: don't use module_init for non-modular core bootflag code

The bootflag.o is obj-y (always built in). It will never be modular, so using module_init as an alias for __initcall is somewhat misleading.

Fix this up now, so that we can relocate module_init from init.h into module.h in the future. If we don't do this, we'd have to add module.h to obviously non-modular code, and that would be a worse thing.

Note that direct use of __initcall is discouraged, vs. one of the priority categorized subgroups. As __initcall gets mapped onto device_initcall, our use of arch_initcall (which makes sense for arch code) will thus change this registration from level 6-device to level 3-arch (i.e. slightly earlier). However no observable impact of that small difference has been observed during testing, or is expected.

arch/x86/kernel/bootflag.c +1 -1
index 5de7f4c56971..52c8e3c7789d 100644
@@ -98,4 +98,4 @@ static int __init sbf_init(void)
 
 	return 0;
 }
-module_init(sbf_init);
+arch_initcall(sbf_init);
Signature · 1 line
1.8.5.2