---

yaml --- r: 295433 b: refs/heads/master c: 344f0a0 h: refs/heads/master i: 295431: c700579 v: v3
git-mirror · Mar 19, 2012 · 9d19f83 · 9d19f83
1 parent e21a287
commit 9d19f83
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36c46f31df910b092aaaed27c7c616bb8e2302a1
+refs/heads/master: 344f0a0631e1b2784859fbe2351d99dce2652b77
diff --git a/trunk/drivers/edac/mce_amd.c b/trunk/drivers/edac/mce_amd.c
@@ -255,10 +255,9 @@ static bool f15h_dc_mce(u16 ec, u8 xec)
 	} else if (BUS_ERROR(ec)) {
 
 		if (!xec)
-			pr_cont("during system linefill.\n");
+			pr_cont("System Read Data Error.\n");
 		else
-			pr_cont(" Internal %s condition.\n",
-				((xec == 1) ? "livelock" : "deadlock"));
+			pr_cont(" Internal error condition type %d.\n", xec);
 	} else
 		ret = false;