diff options
| author | Robert Richter <robert.richter@amd.com> | 2009-01-11 13:01:16 +0100 |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2009-06-11 19:41:50 +0200 |
| commit | d20f24c66011f8a397bca6c5d1a6a7c7e612d2d7 (patch) | |
| tree | d4eed3fecba2c95f97151c0b92938613e93cc3e1 /arch/x86/oprofile | |
| parent | 9063759540daac40cc1f402f83a3be6b489f8583 (diff) | |
| download | linux-d20f24c66011f8a397bca6c5d1a6a7c7e612d2d7.tar.bz2 | |
x86/oprofile: simplify AMD cpu init code
Signed-off-by: Robert Richter <robert.richter@amd.com>
Diffstat (limited to 'arch/x86/oprofile')
| -rw-r--r-- | arch/x86/oprofile/nmi_int.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c index dd8515301fbf..ae0ab03959b4 100644 --- a/arch/x86/oprofile/nmi_int.c +++ b/arch/x86/oprofile/nmi_int.c @@ -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) */ switch (family) { - default: - return -ENODEV; case 6: - model = &op_amd_spec; cpu_type = "i386/athlon"; break; case 0xf: - model = &op_amd_spec; - /* Actually it could be i386/hammer too, but give - user space an consistent name. */ + /* + * Actually it could be i386/hammer too, but + * give user space an consistent name. + */ cpu_type = "x86-64/hammer"; break; case 0x10: - model = &op_amd_spec; cpu_type = "x86-64/family10"; break; case 0x11: - model = &op_amd_spec; cpu_type = "x86-64/family11h"; break; + default: + return -ENODEV; } + model = &op_amd_spec; break; case X86_VENDOR_INTEL: |