2 files changed, 2 insertions, 4 deletions

diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h
index 958b90f761e5..276392f121fb 100644
--- a/arch/x86/include/asm/mce.h
+++ b/arch/x86/include/asm/mce.h
@@ -78,7 +78,6 @@
 /* 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)
 
 #define MCE_LOG_LEN 32
 #define MCE_LOG_SIGNATURE       "MACHINECHECK"
diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd.c b/arch/x86/kernel/cpu/mcheck/mce_amd.c
index 9af7bd74828b..6606523ff1c1 100644
--- a/arch/x86/kernel/cpu/mcheck/mce_amd.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_amd.c
@@ -318,10 +318,9 @@ static void amd_threshold_interrupt(void)
 
 log:
         mce_setup(&m);
-        rdmsrl(MSR_IA32_MCG_STATUS, m.mcgstatus);
-        rdmsrl(address, m.misc);
         rdmsrl(MSR_IA32_MCx_STATUS(bank), m.status);
-        m.bank = K8_MCE_THRESHOLD_BASE + bank * NR_BLOCKS + block;
+        m.misc = ((u64)high << 32) | low;
+        m.bank = bank;
         mce_log(&m);
 
         wrmsrl(MSR_IA32_MCx_STATUS(bank), 0);