From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933679AbaHYWoX (ORCPT ); Mon, 25 Aug 2014 18:44:23 -0400 Received: from mga03.intel.com ([143.182.124.21]:39297 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933610AbaHYWnn (ORCPT ); Mon, 25 Aug 2014 18:43:43 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.04,400,1406617200"; d="scan'208";a="472515435" From: Andi Kleen To: peterz@infradead.org Cc: linux-kernel@vger.kernel.org, mingo@kernel.org, eranian@google.com, Andi Kleen Subject: [PATCH 1/5] perf, x86: Remove incorrect model number from Haswell perf Date: Mon, 25 Aug 2014 15:43:27 -0700 Message-Id: <1409006611-30741-2-git-send-email-andi@firstfloor.org> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1409006611-30741-1-git-send-email-andi@firstfloor.org> References: <1409006611-30741-1-git-send-email-andi@firstfloor.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andi Kleen Signed-off-by: Andi Kleen --- arch/x86/kernel/cpu/perf_event_intel.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c index 89bc750..e280a86 100644 --- a/arch/x86/kernel/cpu/perf_event_intel.c +++ b/arch/x86/kernel/cpu/perf_event_intel.c @@ -2541,10 +2541,9 @@ __init int intel_pmu_init(void) case 60: /* 22nm Haswell */ + case 70: 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)); -- 1.9.3