diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-27 19:06:43 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-27 19:06:43 +0300 |
| commit | de0b9d751b9cd4cfedd0112722e84d0b5abaac73 (patch) | |
| tree | 060ed78592245d7f3af72dfe93a36c186b0b6ffe /arch/x86/include/asm | |
| parent | fac3fcae3244d6d8af61f04d2c10b4fd5ee03933 (diff) | |
| parent | fc08a4703a418a398bbb575ac311d36d110ac786 (diff) | |
| download | linux-de0b9d751b9cd4cfedd0112722e84d0b5abaac73.tar.xz | |
Merge branch 'ras-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull RAS fixes from Thomas Gleixner:
"Two fixlets for RAS:
- Export memory_error() so the NFIT module can utilize it
- Handle memory errors in NFIT correctly"
* 'ras-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
acpi, nfit: Fix the memory error check in nfit_handle_mce()
x86/MCE: Export memory_error()
Diffstat (limited to 'arch/x86/include/asm')
| -rw-r--r-- | arch/x86/include/asm/mce.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h index 4fd5195deed0..3f9a3d2a5209 100644 --- a/arch/x86/include/asm/mce.h +++ b/arch/x86/include/asm/mce.h @@ -266,6 +266,7 @@ static inline int umc_normaddr_to_sysaddr(u64 norm_addr, u16 nid, u8 umc, u64 *s #endif int mce_available(struct cpuinfo_x86 *c); +bool mce_is_memory_error(struct mce *m); DECLARE_PER_CPU(unsigned, mce_exception_count); DECLARE_PER_CPU(unsigned, mce_poll_count); |