Commit d20f24c6 authored by Robert Richter's avatar Robert Richter

x86/oprofile: simplify AMD cpu init code

Signed-off-by: default avatarRobert Richter <robert.richter@amd.com>
parent 90637595
...@@ -460,27 +460,26 @@ int __init op_nmi_init(struct oprofile_operations *ops) ...@@ -460,27 +460,26 @@ int __init op_nmi_init(struct oprofile_operations *ops)
/* Needs to be at least an Athlon (or hammer in 32bit mode) */ /* Needs to be at least an Athlon (or hammer in 32bit mode) */
switch (family) { switch (family) {
default:
return -ENODEV;
case 6: case 6:
model = &op_amd_spec;
cpu_type = "i386/athlon"; cpu_type = "i386/athlon";
break; break;
case 0xf: case 0xf:
model = &op_amd_spec; /*
/* Actually it could be i386/hammer too, but give * Actually it could be i386/hammer too, but
user space an consistent name. */ * give user space an consistent name.
*/
cpu_type = "x86-64/hammer"; cpu_type = "x86-64/hammer";
break; break;
case 0x10: case 0x10:
model = &op_amd_spec;
cpu_type = "x86-64/family10"; cpu_type = "x86-64/family10";
break; break;
case 0x11: case 0x11:
model = &op_amd_spec;
cpu_type = "x86-64/family11h"; cpu_type = "x86-64/family11h";
break; break;
default:
return -ENODEV;
} }
model = &op_amd_spec;
break; break;
case X86_VENDOR_INTEL: case X86_VENDOR_INTEL:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment