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

Commit 2d678b68 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'edac_for_4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp 

Pull EDAC fixes from Borislav Petkov:
 "Two minor fixlets this time: AMD MCE decoding correction and
  xgene_edac cleanup"

* tag 'edac_for_4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  EDAC, mce_amd: Don't emit 'CE' for Deferred error
  EDAC, xgene: Drop owner assignment from platform_driver
parents 73b6fa8e 99e1dfb7

drivers/edac/mce_amd.c

+2 −1
Original line number Diff line number Diff line
@@ -763,7 +763,8 @@ int amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data) 
		c->x86, c->x86_model, c->x86_mask,

		m->bank,

		((m->status & MCI_STATUS_OVER)	? "Over"  : "-"),

		((m->status & MCI_STATUS_UC)	? "UE"	  : "CE"),

		((m->status & MCI_STATUS_UC)	? "UE"	  :

		 (m->status & MCI_STATUS_DEFERRED) ? "-"  : "CE"),

		((m->status & MCI_STATUS_MISCV)	? "MiscV" : "-"),

		((m->status & MCI_STATUS_PCC)	? "PCC"	  : "-"),

		((m->status & MCI_STATUS_ADDRV)	? "AddrV" : "-"));

drivers/edac/xgene_edac.c

+0 −1
Original line number Diff line number Diff line
@@ -1168,7 +1168,6 @@ static struct platform_driver xgene_edac_driver = { 
	.remove = xgene_edac_remove,

	.driver = {

		.name = "xgene-edac",

		.owner = THIS_MODULE,

		.of_match_table = xgene_edac_of_match,

	},

};