summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorShaohua Li <shaohua.li@intel.com>2005-11-07 00:58:42 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-07 07:53:30 -0800
commit31ab269a0307d8725737dfbbdeb5dcde7b41bc36 (patch)
tree15bfdaddcb3831d30e6d34caa54356b63adc61ae /include
parent47b90ffe5c10ab9b5cfd14087b28b13109673ee5 (diff)
downloadlinux-31ab269a0307d8725737dfbbdeb5dcde7b41bc36.tar.gz
linux-31ab269a0307d8725737dfbbdeb5dcde7b41bc36.tar.bz2
linux-31ab269a0307d8725737dfbbdeb5dcde7b41bc36.zip
[PATCH] x86: add MCE resume
It's widely seen a MCE non-fatal error reported after resume. It seems MCE resume is lacked under ia32. This patch tries to fix the gap. Signed-off-by: Shaohua Li <shaohua.li@intel.com> Acked-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
-rw-r--r--include/asm-i386/processor.h6
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);
#define mtrr_bp_init() do {} while (0)
#endif
+#ifdef CONFIG_X86_MCE
+extern void mcheck_init(struct cpuinfo_x86 *c);
+#else
+#define mcheck_init(c) do {} while(0)
+#endif
+
#endif /* __ASM_I386_PROCESSOR_H */