diff options
Diffstat (limited to 'arch/x86/include/asm/mce.h')
-rw-r--r-- | arch/x86/include/asm/mce.h | 36 |
1 files changed, 34 insertions, 2 deletions
diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h index 540a466e50f5..aae6fe2112f9 100644 --- a/arch/x86/include/asm/mce.h +++ b/arch/x86/include/asm/mce.h | |||
@@ -102,10 +102,42 @@ struct mce_log { | |||
102 | 102 | ||
103 | #ifdef __KERNEL__ | 103 | #ifdef __KERNEL__ |
104 | 104 | ||
105 | #include <linux/percpu.h> | ||
106 | #include <linux/init.h> | ||
107 | #include <asm/atomic.h> | ||
108 | |||
105 | extern int mce_disabled; | 109 | extern int mce_disabled; |
106 | 110 | ||
107 | #include <asm/atomic.h> | 111 | #ifdef CONFIG_X86_OLD_MCE |
108 | #include <linux/percpu.h> | 112 | void amd_mcheck_init(struct cpuinfo_x86 *c); |
113 | void intel_p4_mcheck_init(struct cpuinfo_x86 *c); | ||
114 | void intel_p6_mcheck_init(struct cpuinfo_x86 *c); | ||
115 | #endif | ||
116 | |||
117 | #ifdef CONFIG_X86_ANCIENT_MCE | ||
118 | void intel_p5_mcheck_init(struct cpuinfo_x86 *c); | ||
119 | void winchip_mcheck_init(struct cpuinfo_x86 *c); | ||
120 | extern int mce_p5_enable; | ||
121 | static inline int mce_p5_enabled(void) { return mce_p5_enable; } | ||
122 | static inline void enable_p5_mce(void) { mce_p5_enable = 1; } | ||
123 | #else | ||
124 | static inline void intel_p5_mcheck_init(struct cpuinfo_x86 *c) {} | ||
125 | static inline void winchip_mcheck_init(struct cpuinfo_x86 *c) {} | ||
126 | static inline int mce_p5_enabled(void) { return 0; } | ||
127 | static inline void enable_p5_mce(void) { } | ||
128 | #endif | ||
129 | |||
130 | /* Call the installed machine check handler for this CPU setup. */ | ||
131 | extern void (*machine_check_vector)(struct pt_regs *, long error_code); | ||
132 | |||
133 | #ifdef CONFIG_X86_OLD_MCE | ||
134 | extern int nr_mce_banks; | ||
135 | extern void intel_set_thermal_handler(void); | ||
136 | #else | ||
137 | static inline void intel_set_thermal_handler(void) { } | ||
138 | #endif | ||
139 | |||
140 | void intel_init_thermal(struct cpuinfo_x86 *c); | ||
109 | 141 | ||
110 | void mce_setup(struct mce *m); | 142 | void mce_setup(struct mce *m); |
111 | void mce_log(struct mce *m); | 143 | void mce_log(struct mce *m); |