From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754304AbcB2LK6 (ORCPT ); Mon, 29 Feb 2016 06:10:58 -0500 Received: from torg.zytor.com ([198.137.202.12]:53804 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751093AbcB2LKt (ORCPT ); Mon, 29 Feb 2016 06:10:49 -0500 Date: Mon, 29 Feb 2016 03:09:40 -0800 From: tip-bot for Thomas Gleixner Message-ID: Cc: tglx@linutronix.de, vincent.weaver@maine.edu, linux-kernel@vger.kernel.org, eranian@google.com, jolsa@redhat.com, mingo@kernel.org, acme@redhat.com, andi.kleen@intel.com, peterz@infradead.org, dasaratharaman.chandramouli@intel.com, jacob.jun.pan@linux.intel.com, kan.liang@intel.com, harish.chegondi@intel.com, bp@alien8.de, hpa@zytor.com, torvalds@linux-foundation.org Reply-To: tglx@linutronix.de, vincent.weaver@maine.edu, linux-kernel@vger.kernel.org, jolsa@redhat.com, eranian@google.com, mingo@kernel.org, acme@redhat.com, peterz@infradead.org, andi.kleen@intel.com, dasaratharaman.chandramouli@intel.com, jacob.jun.pan@linux.intel.com, kan.liang@intel.com, harish.chegondi@intel.com, bp@alien8.de, hpa@zytor.com, torvalds@linux-foundation.org In-Reply-To: <20160222221012.149331888@linutronix.de> References: <20160222221012.149331888@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf/x86/intel/rapl: Make Knights Landings support functional Git-Commit-ID: 4d120c535d638a952e644817ba3cbef30deedb2b 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: 4d120c535d638a952e644817ba3cbef30deedb2b Gitweb: http://git.kernel.org/tip/4d120c535d638a952e644817ba3cbef30deedb2b Author: Thomas Gleixner AuthorDate: Mon, 22 Feb 2016 22:19:20 +0000 Committer: Ingo Molnar CommitDate: Mon, 29 Feb 2016 09:35:21 +0100 perf/x86/intel/rapl: Make Knights Landings support functional The Knights Landings support added the events and the detection case, but then returns 0 without actually initializing the driver. Signed-off-by: Thomas Gleixner Signed-off-by: Peter Zijlstra (Intel) Cc: Andi Kleen Cc: Arnaldo Carvalho de Melo Cc: Borislav Petkov Cc: Dasaratharaman Chandramouli Cc: Harish Chegondi Cc: Jacob Pan Cc: Jiri Olsa Cc: Kan Liang Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Vince Weaver Cc: linux-kernel@vger.kernel.org Fixes: 3a2a7797326a4 "perf/x86/intel/rapl: Add support for Knights Landing (KNL)" Link: http://lkml.kernel.org/r/20160222221012.149331888@linutronix.de Signed-off-by: Ingo Molnar --- arch/x86/events/intel/rapl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/events/intel/rapl.c b/arch/x86/events/intel/rapl.c index 580f504..536f0ce 100644 --- a/arch/x86/events/intel/rapl.c +++ b/arch/x86/events/intel/rapl.c @@ -731,7 +731,7 @@ static int __init rapl_pmu_init(void) rapl_add_quirk(rapl_hsw_server_quirk); rapl_cntr_mask = RAPL_IDX_KNL; rapl_pmu_events_group.attrs = rapl_events_knl_attr; - + break; default: /* unsupported */ return 0;