diff options
| author | Andi Kleen <ak@linux.intel.com> | 2008-08-20 17:22:02 +0200 |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2008-10-13 19:25:06 +0200 |
| commit | f645f6406463a01869c50844befc76d528971690 (patch) | |
| tree | d4e5bd98a3c87e8bc78da1c1940eea66b2aaf914 /arch/x86/oprofile | |
| parent | 5d4488027d9cf3161c71566dfabb116bf69ab4d9 (diff) | |
| download | linux-3.10-f645f6406463a01869c50844befc76d528971690.tar.gz linux-3.10-f645f6406463a01869c50844befc76d528971690.tar.bz2 linux-3.10-f645f6406463a01869c50844befc76d528971690.zip | |
oprofile: Don't report Nehalem as core_2
This essentially reverts Linus' earlier 4b9f12a3779c548b68bc9af7d94030868ad3aa1b
commit. Nehalem is not core_2, so it shouldn't be reported as such.
However with the earlier arch perfmon patch it will fall back to
arch perfmon mode now, so there is no need to fake it as core_2.
The only drawback is that Linus will need to patch the arch perfmon
support into his oprofile binary now, but I think he can do that.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Robert Richter <robert.richter@amd.com>
Diffstat (limited to 'arch/x86/oprofile')
| -rw-r--r-- | arch/x86/oprofile/nmi_int.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c index 57f6c908808..1059f3fe6b1 100644 --- a/arch/x86/oprofile/nmi_int.c +++ b/arch/x86/oprofile/nmi_int.c @@ -420,9 +420,6 @@ static int __init ppro_init(char **cpu_type) case 15: case 23: *cpu_type = "i386/core_2"; break; - case 26: - *cpu_type = "i386/core_2"; - break; default: /* Unknown */ return 0; |