Skip to content

Commit

Permalink
Merge tag 'please-pull-fixmcelog' of git://git.kernel.org/pub/scm/lin…
Browse files Browse the repository at this point in the history
…ux/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
  • Loading branch information
Linus Torvalds committed Feb 18, 2015
2 parents fbe4da4 + a2413d8 commit d96c757
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions arch/x86/kernel/cpu/mcheck/mce.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down

0 comments on commit d96c757

Please sign in to comment.