diff options
| author | Borislav Petkov <borislav.petkov@amd.com> | 2010-09-22 17:44:51 +0200 |
|---|---|---|
| committer | Borislav Petkov <borislav.petkov@amd.com> | 2011-01-07 11:54:24 +0100 |
| commit | bad11e031862294265145d87dd4be1ae4af0d57f (patch) | |
| tree | ccc411f7b6543e807137ad68f6c79c7ce5b88ba7 | |
| parent | 1b07ca47ff2fbffbe09d8b0a0a25d8747a3cdcae (diff) | |
| download | linux-bad11e031862294265145d87dd4be1ae4af0d57f.tar.gz linux-bad11e031862294265145d87dd4be1ae4af0d57f.tar.bz2 linux-bad11e031862294265145d87dd4be1ae4af0d57f.zip | |
EDAC, MCE: Enable MCE decoding on F15h
Now that everything is inplace, enable MCE decoding on F15h. Make
initcall routine a bit more readable.
Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
| -rw-r--r-- | drivers/edac/mce_amd.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/edac/mce_amd.c b/drivers/edac/mce_amd.c index 0a19d2626686..59ad34c506a5 100644 --- a/drivers/edac/mce_amd.c +++ b/drivers/edac/mce_amd.c @@ -836,18 +836,21 @@ static struct notifier_block amd_mce_dec_nb = { static int __init mce_amd_init(void) { - if (boot_cpu_data.x86_vendor != X86_VENDOR_AMD) + struct cpuinfo_x86 *c = &boot_cpu_data; + + if (c->x86_vendor != X86_VENDOR_AMD) return 0; - if ((boot_cpu_data.x86 < 0xf || boot_cpu_data.x86 > 0x12) && - (boot_cpu_data.x86 != 0x14 || boot_cpu_data.x86_model > 0xf)) + if ((c->x86 < 0xf || c->x86 > 0x12) && + (c->x86 != 0x14 || c->x86_model > 0xf) && + (c->x86 != 0x15 || c->x86_model > 0xf)) return 0; fam_ops = kzalloc(sizeof(struct amd_decoder_ops), GFP_KERNEL); if (!fam_ops) return -ENOMEM; - switch (boot_cpu_data.x86) { + switch (c->x86) { case 0xf: fam_ops->dc_mce = k8_dc_mce; fam_ops->ic_mce = k8_ic_mce; @@ -887,8 +890,7 @@ static int __init mce_amd_init(void) break; default: - printk(KERN_WARNING "Huh? What family is that: %d?!\n", - boot_cpu_data.x86); + printk(KERN_WARNING "Huh? What family is that: %d?!\n", c->x86); kfree(fam_ops); return -EINVAL; } |