Commit 0873a5d6 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds

[PATCH] Minor K8 fix for oprofile

K8 can run with a 32bit kernel too.  If that's the case we have to tell
user space about it.  Remove the unneeded ifdef.

In that case the CPU is called "x86-64/hammer" even on 32bit.  This is
not strictly true on i386, but it's the named used by the current
oprofile user space for K8 performance counters and it would complicate
things to use different names between 32bit and 64bit.
parent 24594a2b
......@@ -372,12 +372,12 @@ int __init nmi_init(struct oprofile_operations ** ops)
model = &op_athlon_spec;
nmi_ops.cpu_type = "i386/athlon";
break;
#if defined(CONFIG_X86_64)
case 0xf:
model = &op_athlon_spec;
/* Actually it could be i386/hammer too, but give
user space an consistent name. */
nmi_ops.cpu_type = "x86-64/hammer";
break;
#endif /* CONFIG_X86_64 */
}
break;
......
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