From 10e8d6f5f32b2e05a50c3c4784f264f4dc281fa4 Mon Sep 17 00:00:00 2001
From: Borislav Petkov <borislav.petkov@amd.com>
Date: Wed, 22 Sep 2010 11:53:32 +0200
Subject: [PATCH] --- yaml --- r: 227313 b: refs/heads/master c:
 b18434cad1740466f7a1c304ea4af0f4d3c874f1 h: refs/heads/master i:   227311:
 0f18d8dcaf5cce4a33f03cd53a92532edc313d0c v: v3

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

diff --git a/[refs] b/[refs]
index 6a892356ae73..c332a018541a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 70fdb494aa8c82f76745d5a32b8abc505813557c
+refs/heads/master: b18434cad1740466f7a1c304ea4af0f4d3c874f1
diff --git a/trunk/drivers/edac/mce_amd.c b/trunk/drivers/edac/mce_amd.c
index 7eb27062f2ef..44e6cdaff663 100644
--- a/trunk/drivers/edac/mce_amd.c
+++ b/trunk/drivers/edac/mce_amd.c
@@ -467,7 +467,7 @@ static void amd_decode_ls_mce(struct mce *m)
 	u16 ec = m->status & 0xffff;
 	u8 xec = (m->status >> 16) & xec_mask;
 
-	if (boot_cpu_data.x86 == 0x14) {
+	if (boot_cpu_data.x86 >= 0x14) {
 		pr_emerg("You shouldn't be seeing an LS MCE on this cpu family,"
 			 " please report on LKML.\n");
 		return;