From 6401b4de9af8ce9db590a5f166b094356353a7d6 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Fri, 16 Sep 2011 13:37:29 -0300
Subject: [PATCH] --- yaml --- r: 273302 b: refs/heads/master c:
 767ba4a52a6de7ea2875a8af79bf11452a2a0c44 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/edac/i7core_edac.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 42274a684b18..7843829e9e9f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4fad8098bc3cc9dfe711b10b07df821ea30e6879
+refs/heads/master: 767ba4a52a6de7ea2875a8af79bf11452a2a0c44
diff --git a/trunk/drivers/edac/i7core_edac.c b/trunk/drivers/edac/i7core_edac.c
index 51d251c32901..70ad8923f1d7 100644
--- a/trunk/drivers/edac/i7core_edac.c
+++ b/trunk/drivers/edac/i7core_edac.c
@@ -746,6 +746,10 @@ static int get_dimm_config(const struct mem_ctl_info *mci)
 
 			csr->edac_mode = mode;
 			csr->mtype = mtype;
+			snprintf(csr->channels[0].label,
+					sizeof(csr->channels[0].label),
+					"CPU#%uChannel#%u_DIMM#%u",
+					pvt->i7core_dev->socket, i, j);
 
 			csrow++;
 		}