Skip to contentSkip to conversation

ia64: don't use module_init for non-modular core kernel/mca.c code

PATCH New Paul Gortmaker 1 participant 1 message Jan 16, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ia64: don't use module_init for non-modular core kernel/mca.c code

The mca.c code is always built in. It will never be modular, so using module_init as an alias for __initcall is rather 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.

Direct use of __initcall is discouraged, vs prioritized ones. Use of device_initcall is consistent with what __initcall maps onto, and hence does not change the init order, making the
impact of this change zero. Should someone with real hardware
for boot testing want to change it later to arch_initcall or something different, they can do that at a later date.

arch/ia64/sn/kernel/mca.c +1 -2
index 27793f7aa99c..5b799d4deb74 100644
@@ -142,5 +142,4 @@ static int __init sn_salinfo_init(void)
 		salinfo_platform_oemdata = &sn_salinfo_platform_oemdata;
 	return 0;
 }
-
-module_init(sn_salinfo_init)
+device_initcall(sn_salinfo_init);
Signature · 1 line
1.8.5.2