From dff1c4f704fa033ca2e273560500f32cc7d9136f Mon Sep 17 00:00:00 2001 From: Borislav Petkov Date: Wed, 12 Sep 2012 18:06:00 +0200 Subject: [PATCH] --- yaml --- r: 336529 b: refs/heads/master c: bb89f5a0547a56cf2406f1c3d6cd44f8fa62256d h: refs/heads/master i: 336527: 32bb55f5e302fc03840bb1a4bc881e783c96d3db v: v3 --- [refs] | 2 +- trunk/drivers/edac/amd64_edac.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 1a0044a36169..d6100c82ec7c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 33ca0643c9a0ea50d0dc9bf0e9e9044502c7038c +refs/heads/master: bb89f5a0547a56cf2406f1c3d6cd44f8fa62256d diff --git a/trunk/drivers/edac/amd64_edac.c b/trunk/drivers/edac/amd64_edac.c index d21efb246d43..cfb7e57786d1 100644 --- a/trunk/drivers/edac/amd64_edac.c +++ b/trunk/drivers/edac/amd64_edac.c @@ -1596,14 +1596,11 @@ static void f1x_map_sysaddr_to_csrow(struct mem_ctl_info *mci, u64 sys_addr, */ static void amd64_debug_display_dimm_sizes(struct amd64_pvt *pvt, u8 ctrl) { - int dimm, size0, size1, factor = 0; + int dimm, size0, size1; u32 *dcsb = ctrl ? pvt->csels[1].csbases : pvt->csels[0].csbases; u32 dbam = ctrl ? pvt->dbam1 : pvt->dbam0; if (boot_cpu_data.x86 == 0xf) { - if (pvt->dclr0 & WIDTH_128) - factor = 1; - /* K8 families < revF not supported yet */ if (pvt->ext_model < K8_REV_F) return; @@ -1634,8 +1631,8 @@ static void amd64_debug_display_dimm_sizes(struct amd64_pvt *pvt, u8 ctrl) DBAM_DIMM(dimm, dbam)); amd64_info(EDAC_MC ": %d: %5dMB %d: %5dMB\n", - dimm * 2, size0 << factor, - dimm * 2 + 1, size1 << factor); + dimm * 2, size0, + dimm * 2 + 1, size1); } }