Merge tag 'ras_for_3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp into x86/ras

Pull RAS updates from Borislav Petkov:

  * Add the functionality to override error reporting agents as some
  machines are sporting a new extended error logging capability which, if
  done properly in the BIOS, makes a corresponding EDAC module redundant,
  from Gong Chen.

  * PCIe AER tracepoint severity levels fix, from Rui Wang.

  * Error path correction for the mce device init, from Levente Kurusa.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 5 insertions, 1 deletions

diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c
index d7f1b57bd3be..1229123ccb59 100644
--- a/drivers/edac/sb_edac.c
+++ b/drivers/edac/sb_edac.c
@@ -1829,6 +1829,9 @@ static int sbridge_mce_check_error(struct notifier_block *nb, unsigned long val,
         struct mem_ctl_info *mci;
         struct sbridge_pvt *pvt;
 
+        if (get_edac_report_status() == EDAC_REPORTING_DISABLED)
+                return NOTIFY_DONE;
+
         mci = get_mci_for_node_id(mce->socketid);
         if (!mci)
                 return NOTIFY_BAD;
@@ -2142,9 +2145,10 @@ static int __init sbridge_init(void)
         opstate_init();
 
         pci_rc = pci_register_driver(&sbridge_driver);
-
         if (pci_rc >= 0) {
                 mce_register_decode_chain(&sbridge_mce_dec);
+                if (get_edac_report_status() == EDAC_REPORTING_DISABLED)
+                        sbridge_printk(KERN_WARNING, "Loading driver, error reporting disabled.\n");
                 return 0;
         }