From 9d19f83b3e573d287457fba197e170bdef875728 Mon Sep 17 00:00:00 2001
From: Borislav Petkov <borislav.petkov@amd.com>
Date: Tue, 15 Nov 2011 17:10:58 +0100
Subject: [PATCH] --- yaml --- r: 295433 b: refs/heads/master c:
 344f0a0631e1b2784859fbe2351d99dce2652b77 h: refs/heads/master i:   295431:
 c70057990b46e5d2ef5c08383c4642d1f77f6832 v: v3

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

diff --git a/[refs] b/[refs]
index f01ba7226750..07e44e5c067a 100644
--- 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
index bd926ea2e00c..0ee1c0a115a2 100644
--- 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;