Merge commit 'v2.6.39-rc3' into for-2.6.39

[pandora-kernel.git] / drivers / edac / mce_amd_inj.c

diff --git a/drivers/edac/mce_amd_inj.c b/drivers/edac/mce_amd_inj.c
index 39faded..a4987e0 100644 (file)
--- a/drivers/edac/mce_amd_inj.c
+++ b/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-existent MCE bank: %lu\n", value);
+                       return -EINVAL;
+               }
 
        i_mce.bank = value;