From 1ac231491d5434243beae072c690fabd55c1c708 Mon Sep 17 00:00:00 2001
From: Borislav Petkov <borislav.petkov@amd.com>
Date: Mon, 6 Sep 2010 15:05:45 +0200
Subject: [PATCH] --- yaml --- r: 212115 b: refs/heads/master c:
 9530d608ef0e1f76b7fd82bb92645062292fc009 h: refs/heads/master i:   212113:
 b930b0cbb56e1d3694c4de2424259d5430fbb862   212111:
 6a366e42a08aeaee735dabdfd69c3f3257ed74a5 v: v3

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

diff --git a/[refs] b/[refs]
index 677d83689bb7..c6c4593a332c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe4ea2623bec3e595f8e77a8514307c389c096ae
+refs/heads/master: 9530d608ef0e1f76b7fd82bb92645062292fc009
diff --git a/trunk/drivers/edac/mce_amd.c b/trunk/drivers/edac/mce_amd.c
index 83b7b5fcee7f..f233c5f78302 100644
--- a/trunk/drivers/edac/mce_amd.c
+++ b/trunk/drivers/edac/mce_amd.c
@@ -598,13 +598,12 @@ static struct notifier_block amd_mce_dec_nb = {
 
 static int __init mce_amd_init(void)
 {
-	/*
-	 * We can decode MCEs for K8, F10h and F11h CPUs:
-	 */
 	if (boot_cpu_data.x86_vendor != X86_VENDOR_AMD)
 		return 0;
 
-	if (boot_cpu_data.x86 < 0xf || boot_cpu_data.x86 > 0x11)
+	if (boot_cpu_data.x86 != 0xf &&
+	    boot_cpu_data.x86 != 0x10 &&
+	    (boot_cpu_data.x86 != 0x14 || boot_cpu_data.x86_model > 0xf))
 		return 0;
 
 	fam_ops = kzalloc(sizeof(struct amd_decoder_ops), GFP_KERNEL);
@@ -638,6 +637,8 @@ static int __init mce_amd_init(void)
 		return -EINVAL;
 	}
 
+	pr_info("MCE: In-kernel MCE decoding enabled.\n");
+
 	atomic_notifier_chain_register(&x86_mce_decoder_chain, &amd_mce_dec_nb);
 
 	return 0;