From dddc1e5fb57f2d5a7a19d4419cadd347f079e785 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Wed, 24 Oct 2012 10:30:01 -0200
Subject: [PATCH] --- yaml --- r: 336213 b: refs/heads/master c:
 24bef66e74d647aebd34e0bef7693512b7912029 h: refs/heads/master i:   336211:
 3cc9c2d3ddd3e768b250b4098d33972edde4930d v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/edac/edac_mc.c | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index b9486d08155a..81cdd035a427 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 479696840239e0cc43efb3c917bdcad2174d2215
+refs/heads/master: 24bef66e74d647aebd34e0bef7693512b7912029
diff --git a/trunk/drivers/edac/edac_mc.c b/trunk/drivers/edac/edac_mc.c
index d5dc9da7f99f..81eb9fd3f717 100644
--- a/trunk/drivers/edac/edac_mc.c
+++ b/trunk/drivers/edac/edac_mc.c
@@ -416,10 +416,18 @@ struct mem_ctl_info *edac_mc_alloc(unsigned mc_num,
 		dimm->cschannel = chn;
 
 		/* Increment csrow location */
-		row++;
-		if (row == tot_csrows) {
-			row = 0;
+		if (layers[0].is_virt_csrow) {
 			chn++;
+			if (chn == tot_channels) {
+				chn = 0;
+				row++;
+			}
+		} else {
+			row++;
+			if (row == tot_csrows) {
+				row = 0;
+				chn++;
+			}
 		}
 
 		/* Increment dimm location */