diff options
-rw-r--r-- | arch/x86/kernel/cpu/mcheck/mce_64.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce_64.c b/arch/x86/kernel/cpu/mcheck/mce_64.c index 60a114ca14f6..0625993bf955 100644 --- 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) | |||
598 | } | 598 | } |
599 | 599 | ||
600 | /* Add per CPU specific workarounds here */ | 600 | /* Add per CPU specific workarounds here */ |
601 | static void __cpuinit mce_cpu_quirks(struct cpuinfo_x86 *c) | 601 | static void mce_cpu_quirks(struct cpuinfo_x86 *c) |
602 | { | 602 | { |
603 | /* This should be disabled by the BIOS, but isn't always */ | 603 | /* This should be disabled by the BIOS, but isn't always */ |
604 | if (c->x86_vendor == X86_VENDOR_AMD) { | 604 | if (c->x86_vendor == X86_VENDOR_AMD) { |
@@ -1056,7 +1056,7 @@ static __cpuinit void mce_remove_device(unsigned int cpu) | |||
1056 | } | 1056 | } |
1057 | 1057 | ||
1058 | /* Make sure there are no machine checks on offlined CPUs. */ | 1058 | /* Make sure there are no machine checks on offlined CPUs. */ |
1059 | static void __cpuexit mce_disable_cpu(void *h) | 1059 | static void mce_disable_cpu(void *h) |
1060 | { | 1060 | { |
1061 | int i; | 1061 | int i; |
1062 | 1062 | ||
@@ -1066,7 +1066,7 @@ static void __cpuexit mce_disable_cpu(void *h) | |||
1066 | wrmsrl(MSR_IA32_MC0_CTL + i*4, 0); | 1066 | wrmsrl(MSR_IA32_MC0_CTL + i*4, 0); |
1067 | } | 1067 | } |
1068 | 1068 | ||
1069 | static void __cpuexit mce_reenable_cpu(void *h) | 1069 | static void mce_reenable_cpu(void *h) |
1070 | { | 1070 | { |
1071 | int i; | 1071 | int i; |
1072 | 1072 | ||