]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge tag 'please-pull-fixmcelog' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Feb 2015 01:03:07 +0000 (17:03 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Feb 2015 01:03:07 +0000 (17:03 -0800)
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

arch/x86/kernel/cpu/mcheck/mce.c

index 3be9fa69f8758d61872888f0fcd9bc26692ae0ae..3c036cb4a370cad399cac636f97840b40c62bd4d 100644 (file)
@@ -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();