From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751964AbcDWMyB (ORCPT ); Sat, 23 Apr 2016 08:54:01 -0400 Received: from terminus.zytor.com ([198.137.202.10]:39048 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751609AbcDWMyA (ORCPT ); Sat, 23 Apr 2016 08:54:00 -0400 Date: Sat, 23 Apr 2016 05:53:10 -0700 From: tip-bot for Srinivas Pandruvada Message-ID: Cc: hpa@zytor.com, tglx@linutronix.de, peterz@infradead.org, torvalds@linux-foundation.org, srinivas.pandruvada@linux.intel.com, alexander.shishkin@linux.intel.com, linux-kernel@vger.kernel.org, eranian@google.com, jolsa@redhat.com, mingo@kernel.org, vincent.weaver@maine.edu, acme@redhat.com Reply-To: peterz@infradead.org, tglx@linutronix.de, hpa@zytor.com, alexander.shishkin@linux.intel.com, srinivas.pandruvada@linux.intel.com, torvalds@linux-foundation.org, eranian@google.com, linux-kernel@vger.kernel.org, acme@redhat.com, vincent.weaver@maine.edu, mingo@kernel.org, jolsa@redhat.com In-Reply-To: <1460907809-11897-1-git-send-email-srinivas.pandruvada@linux.intel.com> References: <1460907809-11897-1-git-send-email-srinivas.pandruvada@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf/x86/intel/rapl: Add missing Haswell model Git-Commit-ID: e1089602a3bf3efd13d0ffc575f3e22213f009da 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: e1089602a3bf3efd13d0ffc575f3e22213f009da Gitweb: http://git.kernel.org/tip/e1089602a3bf3efd13d0ffc575f3e22213f009da Author: Srinivas Pandruvada AuthorDate: Sun, 17 Apr 2016 08:43:29 -0700 Committer: Ingo Molnar CommitDate: Sat, 23 Apr 2016 13:46:45 +0200 perf/x86/intel/rapl: Add missing Haswell model Added one missing Haswell model. Signed-off-by: Srinivas Pandruvada Signed-off-by: Peter Zijlstra (Intel) Cc: Alexander Shishkin Cc: Arnaldo Carvalho de Melo Cc: Jiri Olsa Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Thomas Gleixner Cc: Vince Weaver Cc: bp@alien8.de Cc: hpa@zytor.com Link: http://lkml.kernel.org/r/1460907809-11897-1-git-send-email-srinivas.pandruvada@linux.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 70c93f9..1705c9d 100644 --- a/arch/x86/events/intel/rapl.c +++ b/arch/x86/events/intel/rapl.c @@ -718,6 +718,7 @@ static int __init rapl_pmu_init(void) break; case 60: /* Haswell */ case 69: /* Haswell-Celeron */ + case 70: /* Haswell GT3e */ case 61: /* Broadwell */ case 71: /* Broadwell-H */ rapl_cntr_mask = RAPL_IDX_HSW;