diff options
author | Andi Kleen <andi@firstfloor.org> | 2009-07-08 18:31:39 -0400 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2009-07-09 21:39:46 -0400 |
commit | 5bb38adcb54cf7192b154368ad62982caa11ca0b (patch) | |
tree | aad7b2b51b20bb7432eab895e715a0407b1ad02f /arch/x86/include/asm/mce.h | |
parent | bab9bc6583fe6c1660d6ed36dd14bbb4edfaf393 (diff) |
x86: mce: Remove old i386 machine check code
As announced in feature-remove-schedule.txt remove CONFIG_X86_OLD_MCE
This patch only removes code.
The ancient machine check code for very old systems that are not supported
by CONFIG_X86_NEW_MCE is still kept.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/include/asm/mce.h')
-rw-r--r-- | arch/x86/include/asm/mce.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h index b50b9e9042c4..6b8a974e1270 100644 --- a/arch/x86/include/asm/mce.h +++ b/arch/x86/include/asm/mce.h | |||
@@ -115,13 +115,6 @@ void mcheck_init(struct cpuinfo_x86 *c); | |||
115 | static inline void mcheck_init(struct cpuinfo_x86 *c) {} | 115 | static inline void mcheck_init(struct cpuinfo_x86 *c) {} |
116 | #endif | 116 | #endif |
117 | 117 | ||
118 | #ifdef CONFIG_X86_OLD_MCE | ||
119 | extern int nr_mce_banks; | ||
120 | void amd_mcheck_init(struct cpuinfo_x86 *c); | ||
121 | void intel_p4_mcheck_init(struct cpuinfo_x86 *c); | ||
122 | void intel_p6_mcheck_init(struct cpuinfo_x86 *c); | ||
123 | #endif | ||
124 | |||
125 | #ifdef CONFIG_X86_ANCIENT_MCE | 118 | #ifdef CONFIG_X86_ANCIENT_MCE |
126 | void intel_p5_mcheck_init(struct cpuinfo_x86 *c); | 119 | void intel_p5_mcheck_init(struct cpuinfo_x86 *c); |
127 | void winchip_mcheck_init(struct cpuinfo_x86 *c); | 120 | void winchip_mcheck_init(struct cpuinfo_x86 *c); |
@@ -208,11 +201,7 @@ extern void (*threshold_cpu_callback)(unsigned long action, unsigned int cpu); | |||
208 | 201 | ||
209 | void intel_init_thermal(struct cpuinfo_x86 *c); | 202 | void intel_init_thermal(struct cpuinfo_x86 *c); |
210 | 203 | ||
211 | #ifdef CONFIG_X86_NEW_MCE | ||
212 | void mce_log_therm_throt_event(__u64 status); | 204 | void mce_log_therm_throt_event(__u64 status); |
213 | #else | ||
214 | static inline void mce_log_therm_throt_event(__u64 status) {} | ||
215 | #endif | ||
216 | 205 | ||
217 | #endif /* __KERNEL__ */ | 206 | #endif /* __KERNEL__ */ |
218 | #endif /* _ASM_X86_MCE_H */ | 207 | #endif /* _ASM_X86_MCE_H */ |