Messages in this thread Patch in this message | | | Date | Wed, 24 Sep 2014 07:58:58 -0700 | From | tip-bot for Andi Kleen <> | Subject | [tip:perf/core] perf/x86/intel: Remove incorrect model number from Haswell perf |
| |
Commit-ID: b76146851eeba6ad9fef982e8cf7cd8ebd4d30e1 Gitweb: http://git.kernel.org/tip/b76146851eeba6ad9fef982e8cf7cd8ebd4d30e1 Author: Andi Kleen <ak@linux.intel.com> AuthorDate: Tue, 2 Sep 2014 11:44:11 -0700 Committer: Ingo Molnar <mingo@kernel.org> CommitDate: Wed, 24 Sep 2014 14:48:15 +0200
perf/x86/intel: Remove incorrect model number from Haswell perf
71 is a Broadwell, not a Haswell. The model number was added by mistake earlier.
Remove it for now, until it can be re-added later with real Broadwell support.
In practice it does not cause a lot of issues because the Broadwell PMU is very similar to Haswell, but some details were wrong, and it's better to handle it correctly.
Signed-off-by: Andi Kleen <ak@linux.intel.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: eranian@google.com Cc: Arnaldo Carvalho de Melo <acme@kernel.org> Link: http://lkml.kernel.org/r/1409683455-29168-1-git-send-email-andi@firstfloor.org Signed-off-by: Ingo Molnar <mingo@kernel.org> --- arch/x86/kernel/cpu/perf_event_intel.c | 1 - 1 file changed, 1 deletion(-)
diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c index 89bc750..f962e26 100644 --- a/arch/x86/kernel/cpu/perf_event_intel.c +++ b/arch/x86/kernel/cpu/perf_event_intel.c @@ -2544,7 +2544,6 @@ __init int intel_pmu_init(void) case 63: case 69: case 70: - case 71: x86_pmu.late_ack = true; memcpy(hw_cache_event_ids, snb_hw_cache_event_ids, sizeof(hw_cache_event_ids)); memcpy(hw_cache_extra_regs, snb_hw_cache_extra_regs, sizeof(hw_cache_extra_regs));
| |