Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9611dc7a authored by Jan Beulich's avatar Jan Beulich Committed by Ingo Molnar
Browse files

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: default avatarJan Beulich <jbeulich@suse.com>
Link: http://lkml.kernel.org/r/50AFB35102000078000AAECA@nat28.tlf.novell.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 13f0e4d2

arch/x86/kernel/cpu/intel_cacheinfo.c

+1 −1
Original line number Diff line number Diff line
@@ -1227,7 +1227,7 @@ static struct notifier_block __cpuinitdata cacheinfo_cpu_notifier = { 
	.notifier_call = cacheinfo_cpu_callback,

};



static int __cpuinit cache_sysfs_init(void)

static int __init cache_sysfs_init(void)

{

	int i;

arch/x86/mm/tlb.c

+1 −1
Original line number Diff line number Diff line
@@ -335,7 +335,7 @@ static const struct file_operations fops_tlbflush = { 
	.llseek = default_llseek,

};



static int __cpuinit create_tlb_flushall_shift(void)

static int __init create_tlb_flushall_shift(void)

{

	debugfs_create_file("tlb_flushall_shift", S_IRUSR | S_IWUSR,

			    arch_debugfs_dir, NULL, &fops_tlbflush);

arch/x86/platform/sfi/sfi.c

+1 −1
Original line number Diff line number Diff line
@@ -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",