Commit d96c757e authored Feb 17, 2015 by Linus Torvalds

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

parents fbe4da49 a2413d8b

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

+1 −4

Original line number	Diff line number	Diff line
		@@ -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();