summaryrefslogtreecommitdiffstats
path: root/arch/ia64
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2015-05-01 20:05:49 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2015-06-16 14:12:30 -0400
commit2e21fa2d11ab61e1827bd5bb1e0e2484931d68e1 (patch)
treeee3efae3230b9bb290b3ac711f2db5bdc1b5bc27 /arch/ia64
parent4a0ece7ceceab251e92e7f98e7926642a065727b (diff)
downloadlinux-stable-2e21fa2d11ab61e1827bd5bb1e0e2484931d68e1.tar.gz
linux-stable-2e21fa2d11ab61e1827bd5bb1e0e2484931d68e1.tar.bz2
linux-stable-2e21fa2d11ab61e1827bd5bb1e0e2484931d68e1.zip
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. Cc: Tony Luck <tony.luck@intel.com> Cc: Fenghua Yu <fenghua.yu@intel.com> Cc: linux-ia64@vger.kernel.org Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'arch/ia64')
-rw-r--r--arch/ia64/sn/kernel/mca.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/ia64/sn/kernel/mca.c b/arch/ia64/sn/kernel/mca.c
index 27793f7aa99c..5b799d4deb74 100644
--- a/arch/ia64/sn/kernel/mca.c
+++ b/arch/ia64/sn/kernel/mca.c
@@ -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);