diff options
| author | David S. Miller <davem@davemloft.net> | 2014-11-01 18:53:27 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-11-01 18:53:27 (GMT) |
| commit | 55b42b5ca2dcf143465968697fe6c6503b05fca1 (patch) | |
| tree | 91878cd53efc44ba67244d4d3897020828c87c01 /drivers/edac/cpc925_edac.c | |
| parent | 10738eeaf4ab3de092586cefcc082e7d43ca0044 (diff) | |
| parent | ec1f1276022e4e3ca40871810217d513e39ff250 (diff) | |
| download | linux-55b42b5ca2dcf143465968697fe6c6503b05fca1.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/phy/marvell.c
Simple overlapping changes in drivers/net/phy/marvell.c
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/edac/cpc925_edac.c')
| -rw-r--r-- | drivers/edac/cpc925_edac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/edac/cpc925_edac.c b/drivers/edac/cpc925_edac.c index df6575f..682288c 100644 --- a/drivers/edac/cpc925_edac.c +++ b/drivers/edac/cpc925_edac.c @@ -562,7 +562,7 @@ static void cpc925_mc_check(struct mem_ctl_info *mci) if (apiexcp & UECC_EXCP_DETECTED) { cpc925_mc_printk(mci, KERN_INFO, "DRAM UECC Fault\n"); - edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1, + edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1, pfn, offset, 0, csrow, -1, -1, mci->ctl_name, ""); |