From e93ec8943432e73d48d8bef8d429846fbfc1a921 Mon Sep 17 00:00:00 2001 From: Josh Hunt Date: Fri, 21 Sep 2012 07:45:49 -0700 Subject: [PATCH] --- yaml --- r: 336535 b: refs/heads/master c: 3c0622760aaa4731e2fd3a7472a96b59d2caecc4 h: refs/heads/master i: 336533: f2542906f34c68233b614ec0a6b10dc865a88bc9 336531: 8ea2b9aa12fbe21644a67a8c3af7a21531887da4 336527: 32bb55f5e302fc03840bb1a4bc881e783c96d3db v: v3 --- [refs] | 2 +- trunk/drivers/edac/edac_mc_sysfs.c | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 115ff4c6b5a6..6e7ca4ddf220 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 16a528ee3975c860dc93fbfc718fe9aa25ed92bc +refs/heads/master: 3c0622760aaa4731e2fd3a7472a96b59d2caecc4 diff --git a/trunk/drivers/edac/edac_mc_sysfs.c b/trunk/drivers/edac/edac_mc_sysfs.c index bd46610979c7..a242dae1aeb0 100644 --- a/trunk/drivers/edac/edac_mc_sysfs.c +++ b/trunk/drivers/edac/edac_mc_sysfs.c @@ -781,10 +781,14 @@ static ssize_t mci_size_mb_show(struct device *dev, for (csrow_idx = 0; csrow_idx < mci->nr_csrows; csrow_idx++) { struct csrow_info *csrow = mci->csrows[csrow_idx]; - for (j = 0; j < csrow->nr_channels; j++) { - struct dimm_info *dimm = csrow->channels[j]->dimm; - - total_pages += dimm->nr_pages; + if (csrow->mci->csbased) { + total_pages += csrow->nr_pages; + } else { + for (j = 0; j < csrow->nr_channels; j++) { + struct dimm_info *dimm = csrow->channels[j]->dimm; + + total_pages += dimm->nr_pages; + } } }