summaryrefslogtreecommitdiffstats
path: root/arch/x86/platform
diff options
context:
space:
mode:
authorJan Beulich2012-11-23 17:33:05 +0100
committerIngo Molnar2013-01-24 17:12:19 +0100
commit9611dc7a8de8a5c6244886dad020995b1a896236 (patch)
tree9f169e2c7551840520f38412860eaef9136950e8 /arch/x86/platform
parentx86/EFI: Properly init-annotate BGRT code (diff)
downloadkernel-qcow2-linux-9611dc7a8de8a5c6244886dad020995b1a896236.tar.gz
kernel-qcow2-linux-9611dc7a8de8a5c6244886dad020995b1a896236.tar.xz
kernel-qcow2-linux-9611dc7a8de8a5c6244886dad020995b1a896236.zip
x86: Convert a few mistaken __cpuinit annotations to __init
The first two are functions serving as initcalls; the SFI one is only being called from __init code. Signed-off-by: Jan Beulich <jbeulich@suse.com> Link: http://lkml.kernel.org/r/50AFB35102000078000AAECA@nat28.tlf.novell.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/platform')
-rw-r--r--arch/x86/platform/sfi/sfi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/platform/sfi/sfi.c b/arch/x86/platform/sfi/sfi.c
index 7785b72ecc3a..bcd1a703e3e6 100644
--- a/arch/x86/platform/sfi/sfi.c
+++ b/arch/x86/platform/sfi/sfi.c
@@ -35,7 +35,7 @@
static unsigned long sfi_lapic_addr __initdata = APIC_DEFAULT_PHYS_BASE;
/* All CPUs enumerated by SFI must be present and enabled */
-static void __cpuinit mp_sfi_register_lapic(u8 id)
+static void __init mp_sfi_register_lapic(u8 id)
{
if (MAX_LOCAL_APIC - id <= 0) {
pr_warning("Processor #%d invalid (max %d)\n",