From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933157AbcJQIuo (ORCPT ); Mon, 17 Oct 2016 04:50:44 -0400 Received: from terminus.zytor.com ([198.137.202.10]:46102 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932385AbcJQIun (ORCPT ); Mon, 17 Oct 2016 04:50:43 -0400 Date: Mon, 17 Oct 2016 01:49:44 -0700 From: tip-bot for Piotr Luc Message-ID: Cc: mingo@kernel.org, piotr.luc@intel.com, hpa@zytor.com, tglx@linutronix.de, jpoimboe@redhat.com, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, bp@alien8.de, dave.hansen@intel.com, luto@kernel.org, brgerst@gmail.com, peterz@infradead.org, dvlasenk@redhat.com Reply-To: brgerst@gmail.com, bp@alien8.de, dave.hansen@intel.com, luto@kernel.org, dvlasenk@redhat.com, peterz@infradead.org, hpa@zytor.com, tglx@linutronix.de, jpoimboe@redhat.com, mingo@kernel.org, piotr.luc@intel.com, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org In-Reply-To: <20161012182634.2462-1-piotr.luc@intel.com> References: <20161012182634.2462-1-piotr.luc@intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] perf/x86/intel: Add Knights Mill CPUID Git-Commit-ID: 608284bf0def3ca5e6936920fcd84294101ef12d X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 608284bf0def3ca5e6936920fcd84294101ef12d Gitweb: http://git.kernel.org/tip/608284bf0def3ca5e6936920fcd84294101ef12d Author: Piotr Luc AuthorDate: Wed, 12 Oct 2016 20:26:34 +0200 Committer: Ingo Molnar CommitDate: Mon, 17 Oct 2016 10:45:08 +0200 perf/x86/intel: Add Knights Mill CPUID Add Knights Mill (KNM) to the list of CPUIDs supported by PMU. Signed-off-by: Piotr Luc Reviewed-by: Dave Hansen Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Josh Poimboeuf Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/20161012182634.2462-1-piotr.luc@intel.com Signed-off-by: Ingo Molnar --- arch/x86/events/intel/core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c index a3a9eb8..eab0915 100644 --- a/arch/x86/events/intel/core.c +++ b/arch/x86/events/intel/core.c @@ -3898,6 +3898,7 @@ __init int intel_pmu_init(void) break; case INTEL_FAM6_XEON_PHI_KNL: + case INTEL_FAM6_XEON_PHI_KNM: memcpy(hw_cache_event_ids, slm_hw_cache_event_ids, sizeof(hw_cache_event_ids)); memcpy(hw_cache_extra_regs, @@ -3912,7 +3913,7 @@ __init int intel_pmu_init(void) x86_pmu.flags |= PMU_FL_HAS_RSP_1; x86_pmu.flags |= PMU_FL_NO_HT_SHARING; - pr_cont("Knights Landing events, "); + pr_cont("Knights Landing/Mill events, "); break; case INTEL_FAM6_SKYLAKE_MOBILE: