x86, mce: remove invalid __cpuinit/__cpuexit annotations

Impact: Bug fix when CPU hotplug is disabled

Correct the following broken __cpuinit/__cpuexit annotations:

- mce_cpu_features() is called from mce_resume(), and so cannot be
  __cpuinit.
- mce_disable_cpu() and mce_reenable_cpu() are called from
  mce_cpu_callback(), and so cannot be __cpuexit().

Cc: Andi Kleen <ak@linux.intel.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

diff --git a/arch/x86/kernel/cpu/mcheck/mce_64.c b/arch/x86/kernel/cpu/mcheck/mce_64.c
index 60a114ca14f6821687c210ef1ab50c5c7312d0bc..0625993bf95538ffed50c577c8e4663cdf0a8239 100644 (file)
--- a/arch/x86/kernel/cpu/mcheck/mce_64.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_64.c
@@ -598,7 +598,7 @@ static void mce_init(void *dummy)
 }
 
 /* Add per CPU specific workarounds here */
-static void __cpuinit mce_cpu_quirks(struct cpuinfo_x86 *c)
+static void mce_cpu_quirks(struct cpuinfo_x86 *c)
 {
        /* This should be disabled by the BIOS, but isn't always */
        if (c->x86_vendor == X86_VENDOR_AMD) {
@@ -1056,7 +1056,7 @@ static __cpuinit void mce_remove_device(unsigned int cpu)
 }
 
 /* Make sure there are no machine checks on offlined CPUs. */
-static void __cpuexit mce_disable_cpu(void *h)
+static void mce_disable_cpu(void *h)
 {
        int i;
 
@@ -1066,7 +1066,7 @@ static void __cpuexit mce_disable_cpu(void *h)
                wrmsrl(MSR_IA32_MC0_CTL + i*4, 0);
 }
 
-static void __cpuexit mce_reenable_cpu(void *h)
+static void mce_reenable_cpu(void *h)
 {
        int i;