summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-05-27 09:06:43 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-05-27 09:06:43 -0700
commitde0b9d751b9cd4cfedd0112722e84d0b5abaac73 (patch)
tree060ed78592245d7f3af72dfe93a36c186b0b6ffe /drivers
parentfac3fcae3244d6d8af61f04d2c10b4fd5ee03933 (diff)
parentfc08a4703a418a398bbb575ac311d36d110ac786 (diff)
downloadlinux-de0b9d751b9cd4cfedd0112722e84d0b5abaac73.tar.bz2
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 'drivers')
-rw-r--r--drivers/acpi/nfit/mce.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/nfit/mce.c b/drivers/acpi/nfit/mce.c
index 3ba1c3472cf9..fd86bec98dea 100644
--- a/drivers/acpi/nfit/mce.c
+++ b/drivers/acpi/nfit/mce.c
@@ -26,7 +26,7 @@ static int nfit_handle_mce(struct notifier_block *nb, unsigned long val,
struct nfit_spa *nfit_spa;
/* We only care about memory errors */
- if (!(mce->status & MCACOD))
+ if (!mce_is_memory_error(mce))
return NOTIFY_DONE;
/*