From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758265AbcJQJn2 (ORCPT ); Mon, 17 Oct 2016 05:43:28 -0400 Received: from terminus.zytor.com ([198.137.202.10]:46908 "EHLO mail.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754765AbcJQJnT (ORCPT ); Mon, 17 Oct 2016 05:43:19 -0400 Date: Mon, 17 Oct 2016 01:50:19 -0700 From: tip-bot for Piotr Luc Message-ID: Cc: jpoimboe@redhat.com, linux-kernel@vger.kernel.org, peterz@infradead.org, tglx@linutronix.de, dvlasenk@redhat.com, bp@alien8.de, torvalds@linux-foundation.org, mingo@kernel.org, brgerst@gmail.com, luto@kernel.org, dave.hansen@intel.com, hpa@zytor.com, piotr.luc@intel.com Reply-To: hpa@zytor.com, piotr.luc@intel.com, brgerst@gmail.com, luto@kernel.org, dave.hansen@intel.com, bp@alien8.de, mingo@kernel.org, torvalds@linux-foundation.org, jpoimboe@redhat.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, peterz@infradead.org, dvlasenk@redhat.com 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: 36c4b6c14d20b37fda79cbcd3e8ef7d11f5ef9dc 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: 36c4b6c14d20b37fda79cbcd3e8ef7d11f5ef9dc Gitweb: http://git.kernel.org/tip/36c4b6c14d20b37fda79cbcd3e8ef7d11f5ef9dc Author: Piotr Luc AuthorDate: Wed, 12 Oct 2016 20:27:25 +0200 Committer: Ingo Molnar CommitDate: Mon, 17 Oct 2016 10:45:09 +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),