From d0ae32cbcbebbf5a31ec7a6df2dc30b34d74f681 Mon Sep 17 00:00:00 2001
From: Borislav Petkov <bp@alien8.de>
Date: Sun, 23 Dec 2012 12:40:45 +0100
Subject: [PATCH] --- yaml --- r: 351117 b: refs/heads/master c:
 0f08669e869e7732846088d67acd2e339c2aa2fb h: refs/heads/master i:   351115:
 67dfc9058df76c7a243b19daac10dda79a939461 v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/edac/mce_amd.c | 17 ++++++-----------
 trunk/drivers/edac/mce_amd.h |  9 ++-------
 3 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index 94a05803d898..bed1798083a9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 980eec8b20a9093f862a28f0f4bf67e55a9497be
+refs/heads/master: 0f08669e869e7732846088d67acd2e339c2aa2fb
diff --git a/trunk/drivers/edac/mce_amd.c b/trunk/drivers/edac/mce_amd.c
index 75441d357d16..f3f0c930d550 100644
--- a/trunk/drivers/edac/mce_amd.c
+++ b/trunk/drivers/edac/mce_amd.c
@@ -39,33 +39,28 @@ EXPORT_SYMBOL_GPL(amd_unregister_ecc_decoder);
  */
 
 /* transaction type */
-const char * const tt_msgs[] = { "INSN", "DATA", "GEN", "RESV" };
-EXPORT_SYMBOL_GPL(tt_msgs);
+static const char * const tt_msgs[] = { "INSN", "DATA", "GEN", "RESV" };
 
 /* cache level */
-const char * const ll_msgs[] = { "RESV", "L1", "L2", "L3/GEN" };
-EXPORT_SYMBOL_GPL(ll_msgs);
+static const char * const ll_msgs[] = { "RESV", "L1", "L2", "L3/GEN" };
 
 /* memory transaction type */
-const char * const rrrr_msgs[] = {
+static const char * const rrrr_msgs[] = {
        "GEN", "RD", "WR", "DRD", "DWR", "IRD", "PRF", "EV", "SNP"
 };
-EXPORT_SYMBOL_GPL(rrrr_msgs);
 
 /* participating processor */
 const char * const pp_msgs[] = { "SRC", "RES", "OBS", "GEN" };
 EXPORT_SYMBOL_GPL(pp_msgs);
 
 /* request timeout */
-const char * const to_msgs[] = { "no timeout", "timed out" };
-EXPORT_SYMBOL_GPL(to_msgs);
+static const char * const to_msgs[] = { "no timeout", "timed out" };
 
 /* memory or i/o */
-const char * const ii_msgs[] = { "MEM", "RESV", "IO", "GEN" };
-EXPORT_SYMBOL_GPL(ii_msgs);
+static const char * const ii_msgs[] = { "MEM", "RESV", "IO", "GEN" };
 
 /* internal error type */
-const char * const uu_msgs[] = { "RESV", "RESV", "HWA", "RESV" };
+static const char * const uu_msgs[] = { "RESV", "RESV", "HWA", "RESV" };
 
 static const char * const f15h_mc1_mce_desc[] = {
 	"UC during a demand linefill from L2",
diff --git a/trunk/drivers/edac/mce_amd.h b/trunk/drivers/edac/mce_amd.h
index 28289084017a..51b7e3a36e37 100644
--- a/trunk/drivers/edac/mce_amd.h
+++ b/trunk/drivers/edac/mce_amd.h
@@ -35,6 +35,8 @@
 #define MCI_STATUS_DEFERRED		BIT_64(44)
 #define MCI_STATUS_POISON		BIT_64(43)
 
+extern const char * const pp_msgs[];
+
 enum tt_ids {
 	TT_INSTR = 0,
 	TT_DATA,
@@ -68,13 +70,6 @@ enum rrrr_ids {
 	R4_SNOOP,
 };
 
-extern const char * const tt_msgs[];
-extern const char * const ll_msgs[];
-extern const char * const rrrr_msgs[];
-extern const char * const pp_msgs[];
-extern const char * const to_msgs[];
-extern const char * const ii_msgs[];
-
 /*
  * per-family decoder ops
  */