From 88fcee8ca109facb7baf8ec32ddb84617fd2d8d4 Mon Sep 17 00:00:00 2001
From: Borislav Petkov <borislav.petkov@amd.com>
Date: Thu, 16 Sep 2010 17:36:12 +0200
Subject: [PATCH] --- yaml --- r: 212119 b: refs/heads/master c:
 cb9d5ecdff66197f65a6be8032ccc1ebf7199684 h: refs/heads/master i:   212117:
 a98fef1272cc467ce007daf2cc4f375e14d5199d   212115:
 1ac231491d5434243beae072c690fabd55c1c708   212111:
 6a366e42a08aeaee735dabdfd69c3f3257ed74a5 v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/edac/mce_amd.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 85e69ed6dca4..95cf4f25a158 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e7281eb37da045abac5bd795d1169fc2e3eeea49
+refs/heads/master: cb9d5ecdff66197f65a6be8032ccc1ebf7199684
diff --git a/trunk/drivers/edac/mce_amd.c b/trunk/drivers/edac/mce_amd.c
index fc3712f1b921..6501392389af 100644
--- a/trunk/drivers/edac/mce_amd.c
+++ b/trunk/drivers/edac/mce_amd.c
@@ -427,7 +427,7 @@ static bool f10h_nb_mce(u16 ec, u8 xec)
 	return ret;
 }
 
-static bool f14h_nb_mce(u16 ec, u8 xec)
+static bool nb_noop_mce(u16 ec, u8 xec)
 {
 	return false;
 }
@@ -641,13 +641,14 @@ static int __init mce_amd_init(void)
 	case 0x12:
 		fam_ops->dc_mce = f12h_dc_mce;
 		fam_ops->ic_mce = k8_ic_mce;
+		fam_ops->nb_mce = nb_noop_mce;
 		break;
 
 	case 0x14:
 		nb_err_cpumask  = 0x3;
 		fam_ops->dc_mce = f14h_dc_mce;
 		fam_ops->ic_mce = f14h_ic_mce;
-		fam_ops->nb_mce = f14h_nb_mce;
+		fam_ops->nb_mce = nb_noop_mce;
 		break;
 
 	default: