From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754098AbcJDIT2 (ORCPT ); Tue, 4 Oct 2016 04:19:28 -0400 Received: from terminus.zytor.com ([198.137.202.10]:37874 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753302AbcJDIT1 (ORCPT ); Tue, 4 Oct 2016 04:19:27 -0400 Date: Tue, 4 Oct 2016 01:17:54 -0700 From: tip-bot for Sukadev Bhattiprolu Message-ID: Cc: sukadev@linux.vnet.ibm.com, acme@redhat.com, peterz@infradead.org, ak@linux.intel.com, tglx@linutronix.de, hpa@zytor.com, maddy@linux.vnet.ibm.com, linux-kernel@vger.kernel.org, mingo@kernel.org Reply-To: ak@linux.intel.com, tglx@linutronix.de, hpa@zytor.com, sukadev@linux.vnet.ibm.com, acme@redhat.com, peterz@infradead.org, linux-kernel@vger.kernel.org, mingo@kernel.org, maddy@linux.vnet.ibm.com In-Reply-To: <1473978296-20712-20-git-send-email-sukadev@linux.vnet.ibm.com> References: <1473978296-20712-20-git-send-email-sukadev@linux.vnet.ibm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf tools: Allow period= in perf stat CPU event descriptions. Git-Commit-ID: 06835545b144cab6e7748748576145ea15f68dff 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: 06835545b144cab6e7748748576145ea15f68dff Gitweb: http://git.kernel.org/tip/06835545b144cab6e7748748576145ea15f68dff Author: Sukadev Bhattiprolu AuthorDate: Thu, 15 Sep 2016 15:24:56 -0700 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 3 Oct 2016 21:50:56 -0300 perf tools: Allow period= in perf stat CPU event descriptions. This avoids the JSON PMU events parser having to know whether its aliases are for perf stat or perf record. Signed-off-by: Andi Kleen Signed-off-by: Sukadev Bhattiprolu Acked-by: Ingo Molnar Cc: Madhavan Srinivasan Cc: Peter Zijlstra Cc: linuxppc-dev@lists.ozlabs.org Link: http://lkml.kernel.org/r/1473978296-20712-20-git-send-email-sukadev@linux.vnet.ibm.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/parse-events.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 8f88f63..d445b11 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -924,6 +924,7 @@ config_term_avail(int term_type, struct parse_events_error *err) case PARSE_EVENTS__TERM_TYPE_CONFIG1: case PARSE_EVENTS__TERM_TYPE_CONFIG2: case PARSE_EVENTS__TERM_TYPE_NAME: + case PARSE_EVENTS__TERM_TYPE_SAMPLE_PERIOD: return true; default: if (!err)