git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
include
/
asm
/
mce.h
diff --git
a/arch/x86/include/asm/mce.h
b/arch/x86/include/asm/mce.h
index 6c3fdd631ed3df7652ed0ad261377006297b7f5f..f32a4301c4d4559157e1ac72f79a239025ccc1e0 100644
(file)
--- a/
arch/x86/include/asm/mce.h
+++ b/
arch/x86/include/asm/mce.h
@@
-225,5
+225,13
@@
extern void mcheck_intel_therm_init(void);
static inline void mcheck_intel_therm_init(void) { }
#endif
static inline void mcheck_intel_therm_init(void) { }
#endif
+/*
+ * Used by APEI to report memory error via /dev/mcelog
+ */
+
+struct cper_sec_mem_err;
+extern void apei_mce_report_mem_error(int corrected,
+ struct cper_sec_mem_err *mem_err);
+
#endif /* __KERNEL__ */
#endif /* _ASM_X86_MCE_H */
#endif /* __KERNEL__ */
#endif /* _ASM_X86_MCE_H */