summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-08-02 14:21:44 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-08-02 14:21:44 -0700
commit940e84fc2681d5265a602a287e0204569ca215fa (patch)
treebf232861d67863af1cc7d7fcff8ac75f22c89a24
parentaa8032b6facc18c91e8798f4475a8b5a82a2f87d (diff)
parent1a7f0e3c4fff449f6dd08787beb98a8e57d8cdc7 (diff)
downloadop-kernel-dev-940e84fc2681d5265a602a287e0204569ca215fa.zip
op-kernel-dev-940e84fc2681d5265a602a287e0204569ca215fa.tar.gz
Merge tag 'please-pull-fix-mce-regression' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras
Pull MCE fix from Tony Luck: "Fix a regression in mce-severity.c" * tag 'please-pull-fix-mce-regression' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras: x86/mce: Fix mce regression from recent cleanup
-rw-r--r--arch/x86/kernel/cpu/mcheck/mce-severity.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce-severity.c b/arch/x86/kernel/cpu/mcheck/mce-severity.c
index e2703520..c370e1c 100644
--- a/arch/x86/kernel/cpu/mcheck/mce-severity.c
+++ b/arch/x86/kernel/cpu/mcheck/mce-severity.c
@@ -111,8 +111,8 @@ static struct severity {
#ifdef CONFIG_MEMORY_FAILURE
MCESEV(
KEEP, "Action required but unaffected thread is continuable",
- SER, MASK(MCI_STATUS_OVER|MCI_UC_SAR|MCI_ADDR|MCACOD, MCI_UC_SAR|MCI_ADDR),
- MCGMASK(MCG_STATUS_RIPV, MCG_STATUS_RIPV)
+ SER, MASK(MCI_STATUS_OVER|MCI_UC_SAR|MCI_ADDR, MCI_UC_SAR|MCI_ADDR),
+ MCGMASK(MCG_STATUS_RIPV|MCG_STATUS_EIPV, MCG_STATUS_RIPV)
),
MCESEV(
AR, "Action required: data load error in a user process",
OpenPOWER on IntegriCloud