Merge tag 'v5.10-rc6' into ras/core

[linux-2.6-microblaze.git] / arch / x86 / kernel / cpu / mce / core.c

diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c
index 32b7099..f319bed 100644 (file)
--- a/arch/x86/kernel/cpu/mce/core.c
+++ b/arch/x86/kernel/cpu/mce/core.c
@@ -162,7 +162,8 @@ EXPORT_SYMBOL_GPL(mce_log);
 
 void mce_register_decode_chain(struct notifier_block *nb)
 {
-       if (WARN_ON(nb->priority > MCE_PRIO_MCELOG && nb->priority < MCE_PRIO_EDAC))
+       if (WARN_ON(nb->priority < MCE_PRIO_LOWEST ||
+                   nb->priority > MCE_PRIO_HIGHEST))
                return;
 
        blocking_notifier_chain_register(&x86_mce_decoder_chain, nb);
@@ -1583,7 +1584,7 @@ static void __mcheck_cpu_mce_banks_init(void)
                 * __mcheck_cpu_init_clear_banks() does the final bank setup.
                 */
                b->ctl = -1ULL;
-               b->init = 1;
+               b->init = true;
        }
 }
 
@@ -1764,7 +1765,7 @@ static int __mcheck_cpu_apply_quirks(struct cpuinfo_x86 *c)
                 */
 
                if (c->x86 == 6 && c->x86_model < 0x1A && this_cpu_read(mce_num_banks) > 0)
-                       mce_banks[0].init = 0;
+                       mce_banks[0].init = false;
 
                /*
                 * All newer Intel systems support MCE broadcasting. Enable
@@ -1813,11 +1814,9 @@ static int __mcheck_cpu_ancient_init(struct cpuinfo_x86 *c)
        case X86_VENDOR_INTEL:
                intel_p5_mcheck_init(c);
                return 1;
-               break;
        case X86_VENDOR_CENTAUR:
                winchip_mcheck_init(c);
                return 1;
-               break;
        default:
                return 0;
        }