[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20150901130246.GA2103@nazgul.tnic>
Date: Tue, 1 Sep 2015 15:02:46 +0200
From: Borislav Petkov <bp@...e.de>
To: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: linux-edac <linux-edac@...r.kernel.org>,
lkml <linux-kernel@...r.kernel.org>
Subject: [GIT PULL] EDAC fixes for 4.3
Hi Linus,
please pull. Two minor fixlets this time.
Thanks.
---
The following changes since commit d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754:
Linux 4.2-rc1 (2015-07-05 11:01:52 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git tags/edac_for_4.3
for you to fetch changes up to 99e1dfb7d2094d9afc1dca57d525f7b36aa18079:
EDAC, mce_amd: Don't emit 'CE' for Deferred error (2015-07-14 06:32:53 +0200)
----------------------------------------------------------------
Minor stuff: AMD MCE decoding correction and xgene_edac cleanup.
----------------------------------------------------------------
Aravind Gopalakrishnan (1):
EDAC, mce_amd: Don't emit 'CE' for Deferred error
Krzysztof Kozlowski (1):
EDAC, xgene: Drop owner assignment from platform_driver
drivers/edac/mce_amd.c | 3 ++-
drivers/edac/xgene_edac.c | 1 -
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/edac/mce_amd.c b/drivers/edac/mce_amd.c
index 58586d59bf8e..e3a945ce374b 100644
--- a/drivers/edac/mce_amd.c
+++ b/drivers/edac/mce_amd.c
@@ -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" : "-"));
diff --git a/drivers/edac/xgene_edac.c b/drivers/edac/xgene_edac.c
index 14636e4b6a08..ba06904af2e1 100644
--- a/drivers/edac/xgene_edac.c
+++ b/drivers/edac/xgene_edac.c
@@ -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,
},
};
--
Regards/Gruss,
Boris.
ECO tip #101: Trim your mails when you reply.
SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton, HRB 21284 (AG Nürnberg)
--
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists