diff options
author | Tony Luck <tony.luck@intel.com> | 2011-06-07 21:51:56 -0400 |
---|---|---|
committer | Borislav Petkov <borislav.petkov@amd.com> | 2011-06-16 05:37:57 -0400 |
commit | 880a317abccf60b989951bf1515964cd73245970 (patch) | |
tree | 44a0ca2e6fcad7ac8c37eed4d9ce725d487db1d0 /arch/x86/kernel | |
parent | ada9c93312f7ec49514c68c211595ce2601cebae (diff) |
x86, mce, severity: Fix two severities table signatures
The "Spurious not enabled" entry is redundant: the "Not enabled" entry
earlier in the table will cover this case.
The "Action required; unknown MCACOD" entry shouldn't specify MCACOD in
the .mask field. Current code will only match for mcacod==0 rather than
all AR=1 entries.
Signed-off-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Link: http://lkml.kernel.org/r/4DEED5BC.8030703@jp.fujitsu.com
Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r-- | arch/x86/kernel/cpu/mcheck/mce-severity.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce-severity.c b/arch/x86/kernel/cpu/mcheck/mce-severity.c index 1e8d66c1336..352d16a6c9b 100644 --- a/arch/x86/kernel/cpu/mcheck/mce-severity.c +++ b/arch/x86/kernel/cpu/mcheck/mce-severity.c | |||
@@ -69,8 +69,6 @@ static struct severity { | |||
69 | MCGMASK(MCG_STATUS_RIPV, 0, PANIC, "In kernel and no restart IP", | 69 | MCGMASK(MCG_STATUS_RIPV, 0, PANIC, "In kernel and no restart IP", |
70 | KERNEL), | 70 | KERNEL), |
71 | BITCLR(MCI_STATUS_UC, KEEP, "Corrected error", NOSER), | 71 | BITCLR(MCI_STATUS_UC, KEEP, "Corrected error", NOSER), |
72 | MASK(MCI_STATUS_OVER|MCI_STATUS_UC|MCI_STATUS_EN, MCI_STATUS_UC, SOME, | ||
73 | "Spurious not enabled", SER), | ||
74 | 72 | ||
75 | /* ignore OVER for UCNA */ | 73 | /* ignore OVER for UCNA */ |
76 | MASK(MCI_UC_SAR, MCI_STATUS_UC, KEEP, | 74 | MASK(MCI_UC_SAR, MCI_STATUS_UC, KEEP, |
@@ -82,7 +80,7 @@ static struct severity { | |||
82 | /* AR add known MCACODs here */ | 80 | /* AR add known MCACODs here */ |
83 | MASK(MCI_STATUS_OVER|MCI_UC_SAR, MCI_STATUS_OVER|MCI_UC_SAR, PANIC, | 81 | MASK(MCI_STATUS_OVER|MCI_UC_SAR, MCI_STATUS_OVER|MCI_UC_SAR, PANIC, |
84 | "Action required with lost events", SER), | 82 | "Action required with lost events", SER), |
85 | MASK(MCI_STATUS_OVER|MCI_UC_SAR|MCACOD, MCI_UC_SAR, PANIC, | 83 | MASK(MCI_STATUS_OVER|MCI_UC_SAR, MCI_UC_SAR, PANIC, |
86 | "Action required; unknown MCACOD", SER), | 84 | "Action required; unknown MCACOD", SER), |
87 | 85 | ||
88 | /* known AO MCACODs: */ | 86 | /* known AO MCACODs: */ |