diff options
author | Borislav Petkov <bp@alien8.de> | 2012-10-17 14:05:33 +0400 |
---|---|---|
committer | Borislav Petkov <bp@alien8.de> | 2012-10-26 16:37:58 +0400 |
commit | 1462594bf2866c1dc80066ed6f49f4331c551901 (patch) | |
tree | 361b807d85cde6b70ccc232f9aaf4079793a63b1 /arch/x86/kernel/cpu/mcheck/mce-severity.c | |
parent | 7af19e4afdafa4adb5fffc569d5bb1c5e568ba98 (diff) | |
download | linux-1462594bf2866c1dc80066ed6f49f4331c551901.tar.xz |
x86, MCA: Finish mca_config conversion
mce_ser, mce_bios_cmci_threshold and mce_disabled are the last three
bools which need conversion. Move them to the mca_config struct and
adjust usage sites accordingly.
Signed-off-by: Borislav Petkov <bp@alien8.de>
Acked-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/x86/kernel/cpu/mcheck/mce-severity.c')
-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 13017626f9a8..beb1f1689e52 100644 --- a/arch/x86/kernel/cpu/mcheck/mce-severity.c +++ b/arch/x86/kernel/cpu/mcheck/mce-severity.c @@ -193,9 +193,9 @@ int mce_severity(struct mce *m, int tolerant, char **msg) continue; if ((m->mcgstatus & s->mcgmask) != s->mcgres) continue; - if (s->ser == SER_REQUIRED && !mce_ser) + if (s->ser == SER_REQUIRED && !mca_cfg.ser) continue; - if (s->ser == NO_SER && mce_ser) + if (s->ser == NO_SER && mca_cfg.ser) continue; if (s->context && ctx != s->context) continue; |