From 5a979507beb2a22b874686fc85aee263b354dca0 Mon Sep 17 00:00:00 2001
From: Borislav Petkov <borislav.petkov@amd.com>
Date: Tue, 22 May 2012 18:47:38 +0200
Subject: [PATCH] --- yaml --- r: 324015 b: refs/heads/master c:
 57639bedd2b8268daa791efcfd0367b9031b057d h: refs/heads/master i:   324013:
 6d3eec70f6a4f589eaa776e60df23ff4433f28bb   324011:
 2fc8c0eb9805b39bfd3d4eb83c05e651e67b4697   324007:
 26760cd8ab3646ff1544ca53bcd744fe57acc469   323999:
 897b1d1db99ff3269a9eb6d2822d6c573063a258 v: v3

---
 [refs]                           |  2 +-
 trunk/arch/x86/include/asm/mce.h | 12 +-----------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 1e38540af896..4f2b4705dfbc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e57dbaf77f372ac461b5b0b353c65efae9739a00
+refs/heads/master: 57639bedd2b8268daa791efcfd0367b9031b057d
diff --git a/trunk/arch/x86/include/asm/mce.h b/trunk/arch/x86/include/asm/mce.h
index a3ac52b29cbf..ccaf7c581c8f 100644
--- a/trunk/arch/x86/include/asm/mce.h
+++ b/trunk/arch/x86/include/asm/mce.h
@@ -116,19 +116,9 @@ struct mce_log {
 /* Software defined banks */
 #define MCE_EXTENDED_BANK	128
 #define MCE_THERMAL_BANK	MCE_EXTENDED_BANK + 0
-
-#define K8_MCE_THRESHOLD_BASE      (MCE_EXTENDED_BANK + 1)      /* MCE_AMD */
-#define K8_MCE_THRESHOLD_BANK_0    (MCE_THRESHOLD_BASE + 0 * 9)
-#define K8_MCE_THRESHOLD_BANK_1    (MCE_THRESHOLD_BASE + 1 * 9)
-#define K8_MCE_THRESHOLD_BANK_2    (MCE_THRESHOLD_BASE + 2 * 9)
-#define K8_MCE_THRESHOLD_BANK_3    (MCE_THRESHOLD_BASE + 3 * 9)
-#define K8_MCE_THRESHOLD_BANK_4    (MCE_THRESHOLD_BASE + 4 * 9)
-#define K8_MCE_THRESHOLD_BANK_5    (MCE_THRESHOLD_BASE + 5 * 9)
-#define K8_MCE_THRESHOLD_DRAM_ECC  (MCE_THRESHOLD_BANK_4 + 0)
-
+#define K8_MCE_THRESHOLD_BASE      (MCE_EXTENDED_BANK + 1)
 
 #ifdef __KERNEL__
-
 extern void mce_register_decode_chain(struct notifier_block *nb);
 extern void mce_unregister_decode_chain(struct notifier_block *nb);