Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65c4cbeb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'edac_fix_for_4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp 

Pull EDAC fix from Borislav Petkov:
 "Make sure sb_edac and i7core_edac do not terminate MCE processing on
  the decoding callchain prematurely"

* tag 'edac_fix_for_4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  EDAC: i7core, sb_edac: Don't return NOTIFY_BAD from mce_decoder callback
parents b49a5195 c4fc1956

drivers/edac/i7core_edac.c

+1 −1
Original line number Diff line number Diff line
@@ -1866,7 +1866,7 @@ static int i7core_mce_check_error(struct notifier_block *nb, unsigned long val, 


	i7_dev = get_i7core_dev(mce->socketid);

	if (!i7_dev)

		return NOTIFY_BAD;

		return NOTIFY_DONE;



	mci = i7_dev->mci;

	pvt = mci->pvt_info;

drivers/edac/sb_edac.c

+1 −1
Original line number Diff line number Diff line
@@ -3168,7 +3168,7 @@ static int sbridge_mce_check_error(struct notifier_block *nb, unsigned long val, 


	mci = get_mci_for_node_id(mce->socketid);

	if (!mci)

		return NOTIFY_BAD;

		return NOTIFY_DONE;

	pvt = mci->pvt_info;



	/*