diff options
| author | Linus Torvalds | 2012-01-07 00:02:37 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2012-01-07 00:02:37 +0100 |
| commit | edf7c8148ec40c0fd27c0ef3f688defcc65e3913 (patch) | |
| tree | dde7448208538c616ad3ba25b41a816fccc015af /drivers/edac/sb_edac.c | |
| parent | Merge branch 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/... (diff) | |
| parent | Merge branch 'mce-inject' of git://git.kernel.org/pub/scm/linux/kernel/git/ra... (diff) | |
| download | kernel-qcow2-linux-edf7c8148ec40c0fd27c0ef3f688defcc65e3913.tar.gz kernel-qcow2-linux-edf7c8148ec40c0fd27c0ef3f688defcc65e3913.tar.xz kernel-qcow2-linux-edf7c8148ec40c0fd27c0ef3f688defcc65e3913.zip | |
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
Diffstat (limited to 'drivers/edac/sb_edac.c')
| -rw-r--r-- | drivers/edac/sb_edac.c | 6 |
1 files changed, 2 insertions, 4 deletions
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: |