diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-02 17:21:44 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-02 17:21:44 -0400 |
| commit | 940e84fc2681d5265a602a287e0204569ca215fa (patch) | |
| tree | bf232861d67863af1cc7d7fcff8ac75f22c89a24 /arch | |
| parent | aa8032b6facc18c91e8798f4475a8b5a82a2f87d (diff) | |
| parent | 1a7f0e3c4fff449f6dd08787beb98a8e57d8cdc7 (diff) | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/cpu/mcheck/mce-severity.c | 4 |
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 e2703520d120..c370e1c4468b 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 { | |||
| 111 | #ifdef CONFIG_MEMORY_FAILURE | 111 | #ifdef CONFIG_MEMORY_FAILURE |
| 112 | MCESEV( | 112 | MCESEV( |
| 113 | KEEP, "Action required but unaffected thread is continuable", | 113 | KEEP, "Action required but unaffected thread is continuable", |
| 114 | SER, MASK(MCI_STATUS_OVER|MCI_UC_SAR|MCI_ADDR|MCACOD, MCI_UC_SAR|MCI_ADDR), | 114 | SER, MASK(MCI_STATUS_OVER|MCI_UC_SAR|MCI_ADDR, MCI_UC_SAR|MCI_ADDR), |
| 115 | MCGMASK(MCG_STATUS_RIPV, MCG_STATUS_RIPV) | 115 | MCGMASK(MCG_STATUS_RIPV|MCG_STATUS_EIPV, MCG_STATUS_RIPV) |
| 116 | ), | 116 | ), |
| 117 | MCESEV( | 117 | MCESEV( |
| 118 | AR, "Action required: data load error in a user process", | 118 | AR, "Action required: data load error in a user process", |