lkml.org 
[lkml]   [2012]   [Nov]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH] 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>

---
arch/x86/kernel/cpu/intel_cacheinfo.c | 2 +-
arch/x86/mm/tlb.c | 2 +-
arch/x86/platform/sfi/sfi.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)

--- 3.7-rc6/arch/x86/kernel/cpu/intel_cacheinfo.c
+++ 3.7-rc6-x86-sections/arch/x86/kernel/cpu/intel_cacheinfo.c
@@ -1192,7 +1192,7 @@ static struct notifier_block __cpuinitda
.notifier_call = cacheinfo_cpu_callback,
};

-static int __cpuinit cache_sysfs_init(void)
+static int __init cache_sysfs_init(void)
{
int i;

--- 3.7-rc6/arch/x86/mm/tlb.c
+++ 3.7-rc6-x86-sections/arch/x86/mm/tlb.c
@@ -335,7 +335,7 @@ static const struct file_operations fops
.llseek = default_llseek,
};

-static int __cpuinit create_tlb_flushall_shift(void)
+static int __init create_tlb_flushall_shift(void)
{
if (cpu_has_invlpg) {
debugfs_create_file("tlb_flushall_shift", S_IRUSR | S_IWUSR,
--- 3.7-rc6/arch/x86/platform/sfi/sfi.c
+++ 3.7-rc6-x86-sections/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",




\
 
 \ /
  Last update: 2012-11-23 18:21    [W:0.159 / U:0.184 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site