Merge branch 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[~shefty/rdma-dev.git] / arch / x86 / kernel / cpu / mcheck / mce_intel.c
index 4f9a3cbfc4a33fb801ab1bf2c822a83e76122897..402c454fbff0992423ec5346a30dd7a26667e983 100644 (file)
@@ -53,7 +53,7 @@ static int cmci_supported(int *banks)
 {
        u64 cap;
 
 {
        u64 cap;
 
-       if (mce_cmci_disabled || mce_ignore_ce)
+       if (mca_cfg.cmci_disabled || mca_cfg.ignore_ce)
                return 0;
 
        /*
                return 0;
 
        /*
@@ -200,7 +200,7 @@ static void cmci_discover(int banks)
                        continue;
                }
 
                        continue;
                }
 
-               if (!mce_bios_cmci_threshold) {
+               if (!mca_cfg.bios_cmci_threshold) {
                        val &= ~MCI_CTL2_CMCI_THRESHOLD_MASK;
                        val |= CMCI_THRESHOLD;
                } else if (!(val & MCI_CTL2_CMCI_THRESHOLD_MASK)) {
                        val &= ~MCI_CTL2_CMCI_THRESHOLD_MASK;
                        val |= CMCI_THRESHOLD;
                } else if (!(val & MCI_CTL2_CMCI_THRESHOLD_MASK)) {
@@ -227,7 +227,7 @@ static void cmci_discover(int banks)
                         * set the thresholds properly or does not work with
                         * this boot option. Note down now and report later.
                         */
                         * set the thresholds properly or does not work with
                         * this boot option. Note down now and report later.
                         */
-                       if (mce_bios_cmci_threshold && bios_zero_thresh &&
+                       if (mca_cfg.bios_cmci_threshold && bios_zero_thresh &&
                                        (val & MCI_CTL2_CMCI_THRESHOLD_MASK))
                                bios_wrong_thresh = 1;
                } else {
                                        (val & MCI_CTL2_CMCI_THRESHOLD_MASK))
                                bios_wrong_thresh = 1;
                } else {
@@ -235,7 +235,7 @@ static void cmci_discover(int banks)
                }
        }
        raw_spin_unlock_irqrestore(&cmci_discover_lock, flags);
                }
        }
        raw_spin_unlock_irqrestore(&cmci_discover_lock, flags);
-       if (mce_bios_cmci_threshold && bios_wrong_thresh) {
+       if (mca_cfg.bios_cmci_threshold && bios_wrong_thresh) {
                pr_info_once(
                        "bios_cmci_threshold: Some banks do not have valid thresholds set\n");
                pr_info_once(
                pr_info_once(
                        "bios_cmci_threshold: Some banks do not have valid thresholds set\n");
                pr_info_once(