Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 9611dc7a8de8a5c6244886dad020995b1a896236

Authored by Jan Beulich
Committed by Ingo Molnar
1 parent 13f0e4d2b9
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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>

Showing 3 changed files with 3 additions and 3 deletions Side-by-side Diff

arch/x86/kernel/cpu/intel_cacheinfo.c
Diff comments   View file @ 9611dc7
... ... @@ -1227,7 +1227,7 @@
1227 1227 .notifier_call = cacheinfo_cpu_callback,
1228 1228 };
1229 1229  
1230   -static int __cpuinit cache_sysfs_init(void)
  1230 +static int __init cache_sysfs_init(void)
1231 1231 {
1232 1232 int i;
1233 1233  
... ... @@ -335,7 +335,7 @@
335 335 .llseek = default_llseek,
336 336 };
337 337  
338   -static int __cpuinit create_tlb_flushall_shift(void)
  338 +static int __init create_tlb_flushall_shift(void)
339 339 {
340 340 debugfs_create_file("tlb_flushall_shift", S_IRUSR | S_IWUSR,
341 341 arch_debugfs_dir, NULL, &fops_tlbflush);
arch/x86/platform/sfi/sfi.c
Diff comments   View file @ 9611dc7
... ... @@ -35,7 +35,7 @@
35 35 static unsigned long sfi_lapic_addr __initdata = APIC_DEFAULT_PHYS_BASE;
36 36  
37 37 /* All CPUs enumerated by SFI must be present and enabled */
38   -static void __cpuinit mp_sfi_register_lapic(u8 id)
  38 +static void __init mp_sfi_register_lapic(u8 id)
39 39 {
40 40 if (MAX_LOCAL_APIC - id <= 0) {
41 41 pr_warning("Processor #%d invalid (max %d)\n",