From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756557AbcJPLYW (ORCPT ); Sun, 16 Oct 2016 07:24:22 -0400 Received: from terminus.zytor.com ([198.137.202.10]:59616 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752904AbcJPLYO (ORCPT ); Sun, 16 Oct 2016 07:24:14 -0400 Date: Sun, 16 Oct 2016 04:23:25 -0700 From: tip-bot for Piotr Luc Message-ID: Cc: torvalds@linux-foundation.org, tglx@linutronix.de, hpa@zytor.com, piotr.luc@intel.com, dvlasenk@redhat.com, brgerst@gmail.com, jpoimboe@redhat.com, peterz@infradead.org, dave.hansen@intel.com, luto@kernel.org, linux-kernel@vger.kernel.org, bp@alien8.de, mingo@kernel.org Reply-To: torvalds@linux-foundation.org, hpa@zytor.com, tglx@linutronix.de, piotr.luc@intel.com, dvlasenk@redhat.com, jpoimboe@redhat.com, brgerst@gmail.com, peterz@infradead.org, dave.hansen@intel.com, luto@kernel.org, linux-kernel@vger.kernel.org, mingo@kernel.org, bp@alien8.de In-Reply-To: <20161012182725.2701-1-piotr.luc@intel.com> References: <20161012182725.2701-1-piotr.luc@intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] perf/x86/intel/rapl: Add Knights Mill CPUID Git-Commit-ID: 8d6feacbdb233b81ea8fb2047032e3073f7fc15e 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: 8d6feacbdb233b81ea8fb2047032e3073f7fc15e Gitweb: http://git.kernel.org/tip/8d6feacbdb233b81ea8fb2047032e3073f7fc15e Author: Piotr Luc AuthorDate: Wed, 12 Oct 2016 20:27:25 +0200 Committer: Ingo Molnar CommitDate: Sun, 16 Oct 2016 11:32:11 +0200 perf/x86/intel/rapl: Add Knights Mill CPUID Add Knights Mill (KNM) to the list of CPUIDs supported by rapl. 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/20161012182725.2701-1-piotr.luc@intel.com Signed-off-by: Ingo Molnar --- arch/x86/events/intel/rapl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/events/intel/rapl.c b/arch/x86/events/intel/rapl.c index b0f0e83..0a535ce 100644 --- a/arch/x86/events/intel/rapl.c +++ b/arch/x86/events/intel/rapl.c @@ -763,6 +763,7 @@ static const struct x86_cpu_id rapl_cpu_match[] __initconst = { X86_RAPL_MODEL_MATCH(INTEL_FAM6_BROADWELL_XEON_D, hsw_rapl_init), X86_RAPL_MODEL_MATCH(INTEL_FAM6_XEON_PHI_KNL, knl_rapl_init), + X86_RAPL_MODEL_MATCH(INTEL_FAM6_XEON_PHI_KNM, knl_rapl_init), X86_RAPL_MODEL_MATCH(INTEL_FAM6_SKYLAKE_MOBILE, skl_rapl_init), X86_RAPL_MODEL_MATCH(INTEL_FAM6_SKYLAKE_DESKTOP, skl_rapl_init),