Skip to content

Commit 2d678b6

Browse files
committed
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
2 parents 73b6fa8 + 99e1dfb commit 2d678b6

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

drivers/edac/mce_amd.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -763,7 +763,8 @@ int amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data)
763763
c->x86, c->x86_model, c->x86_mask,
764764
m->bank,
765765
((m->status & MCI_STATUS_OVER) ? "Over" : "-"),
766-
((m->status & MCI_STATUS_UC) ? "UE" : "CE"),
766+
((m->status & MCI_STATUS_UC) ? "UE" :
767+
(m->status & MCI_STATUS_DEFERRED) ? "-" : "CE"),
767768
((m->status & MCI_STATUS_MISCV) ? "MiscV" : "-"),
768769
((m->status & MCI_STATUS_PCC) ? "PCC" : "-"),
769770
((m->status & MCI_STATUS_ADDRV) ? "AddrV" : "-"));

drivers/edac/xgene_edac.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1168,7 +1168,6 @@ static struct platform_driver xgene_edac_driver = {
11681168
.remove = xgene_edac_remove,
11691169
.driver = {
11701170
.name = "xgene-edac",
1171-
.owner = THIS_MODULE,
11721171
.of_match_table = xgene_edac_of_match,
11731172
},
11741173
};

0 commit comments

Comments
 (0)