From 35b6b1edf323006ecc1b1d6487c4854ca97834a6 Mon Sep 17 00:00:00 2001
From: Borislav Petkov <borislav.petkov@amd.com>
Date: Tue, 9 Nov 2010 19:41:49 +0100
Subject: [PATCH] --- yaml --- r: 227319 b: refs/heads/master c:
 1b07ca47ff2fbffbe09d8b0a0a25d8747a3cdcae h: refs/heads/master i:   227317:
 44fef107a403406dd4e93b5ab4f163a771cee0f0   227315:
 80f07e6d9f713686b0cc63994133a5cb5502fde8   227311:
 0f18d8dcaf5cce4a33f03cd53a92532edc313d0c v: v3

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

diff --git a/[refs] b/[refs]
index 645661b6a35a..cbe75dee7f88 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa7ae8cc8c88c0679eab24c5a1b5d3b134a5f542
+refs/heads/master: 1b07ca47ff2fbffbe09d8b0a0a25d8747a3cdcae
diff --git a/trunk/drivers/edac/mce_amd_inj.c b/trunk/drivers/edac/mce_amd_inj.c
index 39faded3cadd..733a7e7a8d6f 100644
--- a/trunk/drivers/edac/mce_amd_inj.c
+++ b/trunk/drivers/edac/mce_amd_inj.c
@@ -88,10 +88,11 @@ static ssize_t edac_inject_bank_store(struct kobject *kobj,
 		return -EINVAL;
 	}
 
-	if (value > 5) {
-		printk(KERN_ERR "Non-existant MCE bank: %lu\n", value);
-		return -EINVAL;
-	}
+	if (value > 5)
+		if (boot_cpu_data.x86 != 0x15 || value > 6) {
+			printk(KERN_ERR "Non-existant MCE bank: %lu\n", value);
+			return -EINVAL;
+		}
 
 	i_mce.bank = value;