diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-10 04:12:10 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-10 04:12:10 -0500 |
| commit | 2f67bdb23d74a6c6fd4f98f64239c5c34d1833cc (patch) | |
| tree | fe533abe3e7c400848647b95e4806f5125c654c3 /include/asm-i386/processor.h | |
| parent | d40d9d29c020f8466c96f8e3ad4b7c014ff1085d (diff) | |
| parent | 3b44f137b9a846c5452d9e6e1271b79b1dbcc942 (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/asm-i386/processor.h')
| -rw-r--r-- | include/asm-i386/processor.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/asm-i386/processor.h b/include/asm-i386/processor.h index 0a4ec764377c..8c02b0318703 100644 --- a/include/asm-i386/processor.h +++ b/include/asm-i386/processor.h | |||
| @@ -718,4 +718,10 @@ extern void mtrr_bp_init(void); | |||
| 718 | #define mtrr_bp_init() do {} while (0) | 718 | #define mtrr_bp_init() do {} while (0) |
| 719 | #endif | 719 | #endif |
| 720 | 720 | ||
| 721 | #ifdef CONFIG_X86_MCE | ||
| 722 | extern void mcheck_init(struct cpuinfo_x86 *c); | ||
| 723 | #else | ||
| 724 | #define mcheck_init(c) do {} while(0) | ||
| 725 | #endif | ||
| 726 | |||
| 721 | #endif /* __ASM_I386_PROCESSOR_H */ | 727 | #endif /* __ASM_I386_PROCESSOR_H */ |