diff options
author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2014-01-10 17:02:02 -0500 |
---|---|---|
committer | Matt Turner <mattst88@gmail.com> | 2015-05-26 10:01:47 -0700 |
commit | 11447c7c4f046350f63693e2c935e6b33a1b62a8 (patch) | |
tree | 95424867a460dd0863f6020a656e083e5abe3ca7 /arch | |
parent | 614aab527b3d48f481854c215251471407473599 (diff) | |
download | linux-stable-11447c7c4f046350f63693e2c935e6b33a1b62a8.tar.gz linux-stable-11447c7c4f046350f63693e2c935e6b33a1b62a8.tar.bz2 linux-stable-11447c7c4f046350f63693e2c935e6b33a1b62a8.zip |
alpha: don't use module_init for non-modular core code
The srm console 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
console_initcall, they can do that at a later date.
Reviewed-by: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Acked-by: Matt Turner <mattst88@gmail.com>
Cc: linux-alpha@vger.kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Matt Turner <mattst88@gmail.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/alpha/kernel/srmcons.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/alpha/kernel/srmcons.c b/arch/alpha/kernel/srmcons.c index 6f01d9ad7b81..72b59511e59a 100644 --- a/arch/alpha/kernel/srmcons.c +++ b/arch/alpha/kernel/srmcons.c @@ -237,8 +237,7 @@ srmcons_init(void) return -ENODEV; } - -module_init(srmcons_init); +device_initcall(srmcons_init); /* |