diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-17 17:03:07 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-17 17:03:07 -0800 |
| commit | d96c757efad495378e25de47000478f571322cf2 (patch) | |
| tree | a7c57b2b46dffdf9c6fb82e45f8cf69ca642baf7 /arch/x86/kernel/cpu/mcheck/mce.c | |
| parent | Merge tag 'docs-fix' of git://git.lwn.net/linux-2.6 (diff) | |
| parent | x86/mce: Fix regression. All error records should report via /dev/mcelog (diff) | |
| download | linux-dev-d96c757efad495378e25de47000478f571322cf2.tar.xz linux-dev-d96c757efad495378e25de47000478f571322cf2.zip | |
Merge tag 'please-pull-fixmcelog' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras
Pull mcelog regression fix from Tony Luck:
"Fix regression - functions on the mce notifier chain should not be
able to decide that an event should not be logged"
* tag 'please-pull-fixmcelog' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
x86/mce: Fix regression. All error records should report via /dev/mcelog
Diffstat (limited to 'arch/x86/kernel/cpu/mcheck/mce.c')
| -rw-r--r-- | arch/x86/kernel/cpu/mcheck/mce.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c index 3be9fa69f875..3c036cb4a370 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c @@ -152,14 +152,11 @@ static struct mce_log mcelog = { void mce_log(struct mce *mce) { unsigned next, entry; - int ret = 0; /* Emit the trace record: */ trace_mce_record(mce); - ret = atomic_notifier_call_chain(&x86_mce_decoder_chain, 0, mce); - if (ret == NOTIFY_STOP) - return; + atomic_notifier_call_chain(&x86_mce_decoder_chain, 0, mce); mce->finished = 0; wmb(); |