Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

* 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86: add IRQ context simulation in module mce-inject
  x86, mce, therm_throt: Don't report power limit and package level thermal throttle events in mcelog
  x86, MCE: Drain mcelog buffer
  x86, mce: Add wrappers for registering on the decode chain

3 files changed, 6 insertions, 8 deletions

diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c
index 70ad8923f1d7..8568d9b61875 100644
--- a/drivers/edac/i7core_edac.c
+++ b/drivers/edac/i7core_edac.c
@@ -2234,7 +2234,7 @@ static void i7core_unregister_mci(struct i7core_dev *i7core_dev)
         if (pvt->enable_scrub)
                 disable_sdram_scrub_setting(mci);
 
-        atomic_notifier_chain_unregister(&x86_mce_decoder_chain, &i7_mce_dec);
+        mce_unregister_decode_chain(&i7_mce_dec);
 
         /* Disable EDAC polling */
         i7core_pci_ctl_release(pvt);
@@ -2336,7 +2336,7 @@ static int i7core_register_mci(struct i7core_dev *i7core_dev)
         /* DCLK for scrub rate setting */
         pvt->dclk_freq = get_dclk_freq();
 
-        atomic_notifier_chain_register(&x86_mce_decoder_chain, &i7_mce_dec);
+        mce_register_decode_chain(&i7_mce_dec);
 
         return 0;
 
diff --git a/drivers/edac/mce_amd.c b/drivers/edac/mce_amd.c
index d0864d9c38ad..bd926ea2e00c 100644
--- a/drivers/edac/mce_amd.c
+++ b/drivers/edac/mce_amd.c
@@ -884,7 +884,7 @@ static int __init mce_amd_init(void)
 
         pr_info("MCE: In-kernel MCE decoding enabled.\n");
 
-        atomic_notifier_chain_register(&x86_mce_decoder_chain, &amd_mce_dec_nb);
+        mce_register_decode_chain(&amd_mce_dec_nb);
 
         return 0;
 }
@@ -893,7 +893,7 @@ early_initcall(mce_amd_init);
 #ifdef MODULE
 static void __exit mce_amd_exit(void)
 {
-        atomic_notifier_chain_unregister(&x86_mce_decoder_chain, &amd_mce_dec_nb);
+        mce_unregister_decode_chain(&amd_mce_dec_nb);
         kfree(fam_ops);
 }
 
diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c
index 88df48956c1b..1dc118d83cc6 100644
--- a/drivers/edac/sb_edac.c
+++ b/drivers/edac/sb_edac.c
@@ -1659,8 +1659,7 @@ static void sbridge_unregister_mci(struct sbridge_dev *sbridge_dev)
         debugf0("MC: " __FILE__ ": %s(): mci = %p, dev = %p\n",
                 __func__, mci, &sbridge_dev->pdev[0]->dev);
 
-        atomic_notifier_chain_unregister(&x86_mce_decoder_chain,
-                                         &sbridge_mce_dec);
+        mce_unregister_decode_chain(&sbridge_mce_dec);
 
         /* Remove MC sysfs nodes */
         edac_mc_del_mc(mci->dev);
@@ -1729,8 +1728,7 @@ static int sbridge_register_mci(struct sbridge_dev *sbridge_dev)
                 goto fail0;
         }
 
-        atomic_notifier_chain_register(&x86_mce_decoder_chain,
-                                       &sbridge_mce_dec);
+        mce_register_decode_chain(&sbridge_mce_dec);
         return 0;
 
 fail0: