---

yaml --- r: 212119 b: refs/heads/master c: cb9d5ec h: refs/heads/master i: 212117: a98fef1 212115: 1ac2314 212111: 6a366e4 v: v3
git-mirror · Oct 21, 2010 · 88fcee8 · 88fcee8
1 parent cfbc9e0
commit 88fcee8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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: