diff options
| -rw-r--r-- | arch/i386/kernel/cpu/mcheck/mce.h | 2 | ||||
| -rw-r--r-- | include/asm-i386/mce.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/i386/kernel/cpu/mcheck/mce.h b/arch/i386/kernel/cpu/mcheck/mce.h index 84fd4cf7d0fb..81fb6e2d35f3 100644 --- a/arch/i386/kernel/cpu/mcheck/mce.h +++ b/arch/i386/kernel/cpu/mcheck/mce.h | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | #include <linux/init.h> | 1 | #include <linux/init.h> |
| 2 | #include <asm/mce.h> | ||
| 2 | 3 | ||
| 3 | void amd_mcheck_init(struct cpuinfo_x86 *c); | 4 | void amd_mcheck_init(struct cpuinfo_x86 *c); |
| 4 | void intel_p4_mcheck_init(struct cpuinfo_x86 *c); | 5 | void intel_p4_mcheck_init(struct cpuinfo_x86 *c); |
| @@ -9,6 +10,5 @@ void winchip_mcheck_init(struct cpuinfo_x86 *c); | |||
| 9 | /* Call the installed machine check handler for this CPU setup. */ | 10 | /* Call the installed machine check handler for this CPU setup. */ |
| 10 | extern fastcall void (*machine_check_vector)(struct pt_regs *, long error_code); | 11 | extern fastcall void (*machine_check_vector)(struct pt_regs *, long error_code); |
| 11 | 12 | ||
| 12 | extern int mce_disabled; | ||
| 13 | extern int nr_mce_banks; | 13 | extern int nr_mce_banks; |
| 14 | 14 | ||
diff --git a/include/asm-i386/mce.h b/include/asm-i386/mce.h index 7cc1a973bf00..b0a02ee34ffd 100644 --- a/include/asm-i386/mce.h +++ b/include/asm-i386/mce.h | |||
| @@ -3,3 +3,5 @@ extern void mcheck_init(struct cpuinfo_x86 *c); | |||
| 3 | #else | 3 | #else |
| 4 | #define mcheck_init(c) do {} while(0) | 4 | #define mcheck_init(c) do {} while(0) |
| 5 | #endif | 5 | #endif |
| 6 | |||
| 7 | extern int mce_disabled; | ||
