---

yaml --- r: 211461 b: refs/heads/master c: 6dcbfe4 h: refs/heads/master i: 211459: d24498e v: v3
git-mirror · Oct 11, 2010 · 650609b · 650609b
1 parent b6b4c39
commit 650609b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git 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
@@ -141,19 +141,16 @@ void mce_amd_feature_init(struct cpuinfo_x86 *c)
 				address = (low & MASK_BLKPTR_LO) >> 21;
 				if (!address)
 					break;
+
 				address += MCG_XBLK_ADDR;
 			} else
 				++address;
 
 			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))