From 887fa556579e4f557c012831105cc1aeaac4059c Mon Sep 17 00:00:00 2001
From: Borislav Petkov <borislav.petkov@amd.com>
Date: Wed, 22 Sep 2010 15:06:24 +0200
Subject: [PATCH] --- yaml --- r: 227314 b: refs/heads/master c:
 05cd667d668eb08845dd49c02130e5223121b715 h: refs/heads/master v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/edac/mce_amd.c | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c332a018541a..a693fef2cb27 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b18434cad1740466f7a1c304ea4af0f4d3c874f1
+refs/heads/master: 05cd667d668eb08845dd49c02130e5223121b715
diff --git a/trunk/drivers/edac/mce_amd.c b/trunk/drivers/edac/mce_amd.c
index 44e6cdaff663..efbcb5389e80 100644
--- a/trunk/drivers/edac/mce_amd.c
+++ b/trunk/drivers/edac/mce_amd.c
@@ -556,6 +556,15 @@ static bool f10h_nb_mce(u16 ec, u8 xec)
 		goto out;
 		break;
 
+	case 0x19:
+		if (boot_cpu_data.x86 == 0x15)
+			pr_cont("Compute Unit Data Error.\n");
+		else
+			ret = false;
+
+		goto out;
+		break;
+
 	case 0x1c ... 0x1f:
 		offset = 24;
 		break;
@@ -804,6 +813,7 @@ static int __init mce_amd_init(void)
 		xec_mask = 0x1f;
 		fam_ops->dc_mce = f15h_dc_mce;
 		fam_ops->ic_mce = f15h_ic_mce;
+		fam_ops->nb_mce = f10h_nb_mce;
 		break;
 
 	default: