From 650609bcc7a706c8519b80324a7fc3542a3e1c6b Mon Sep 17 00:00:00 2001
From: Borislav Petkov <borislav.petkov@amd.com>
Date: Fri, 8 Oct 2010 12:08:34 +0200
Subject: [PATCH] --- yaml --- r: 211461 b: refs/heads/master c:
 6dcbfe4f0b4e17e289d56fa534b7ce5a6b7f63a3 h: refs/heads/master i:   211459:
 d24498edda1155327e1a88e033fb05e571c1cae1 v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/x86/kernel/cpu/mcheck/mce_amd.c | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 6ca281918fdd..0d4628b6c639 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b62be8ea9db4048112219ff6d6ce5f183179d4dc
+refs/heads/master: 6dcbfe4f0b4e17e289d56fa534b7ce5a6b7f63a3
diff --git a/trunk/arch/x86/kernel/cpu/mcheck/mce_amd.c b/trunk/arch/x86/kernel/cpu/mcheck/mce_amd.c
index 5e975298fa81..39aaee5c1ab2 100644
--- a/trunk/arch/x86/kernel/cpu/mcheck/mce_amd.c
+++ b/trunk/arch/x86/kernel/cpu/mcheck/mce_amd.c
@@ -141,6 +141,7 @@ void mce_amd_feature_init(struct cpuinfo_x86 *c)
 				address = (low & MASK_BLKPTR_LO) >> 21;
 				if (!address)
 					break;
+
 				address += MCG_XBLK_ADDR;
 			} else
 				++address;
@@ -148,12 +149,8 @@ void mce_amd_feature_init(struct cpuinfo_x86 *c)
 			if (rdmsr_safe(address, &low, &high))
 				break;
 
-			if (!(high & MASK_VALID_HI)) {
-				if (block)
-					continue;
-				else
-					break;
-			}
+			if (!(high & MASK_VALID_HI))
+				continue;
 
 			if (!(high & MASK_CNTP_HI)  ||
 			     (high & MASK_LOCKED_HI))