From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933243AbcAMJkL (ORCPT ); Wed, 13 Jan 2016 04:40:11 -0500 Received: from terminus.zytor.com ([198.137.202.10]:48651 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932272AbcAMJkI (ORCPT ); Wed, 13 Jan 2016 04:40:08 -0500 Date: Wed, 13 Jan 2016 01:39:45 -0800 From: tip-bot for Jiri Olsa Message-ID: Cc: markus@trippelsdorf.de, dsahern@gmail.com, namhyung@kernel.org, a.p.zijlstra@chello.nl, tglx@linutronix.de, linux-kernel@vger.kernel.org, mingo@kernel.org, jolsa@kernel.org, hpa@zytor.com, acme@redhat.com Reply-To: linux-kernel@vger.kernel.org, mingo@kernel.org, markus@trippelsdorf.de, dsahern@gmail.com, tglx@linutronix.de, a.p.zijlstra@chello.nl, namhyung@kernel.org, hpa@zytor.com, jolsa@kernel.org, acme@redhat.com In-Reply-To: <1452591329-27620-1-git-send-email-jolsa@kernel.org> References: <1452591329-27620-1-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf stat: Fix recort_usage typo Git-Commit-ID: 8a59f3ccbc11fcb222b046a64929dd473f7dff54 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: 8a59f3ccbc11fcb222b046a64929dd473f7dff54 Gitweb: http://git.kernel.org/tip/8a59f3ccbc11fcb222b046a64929dd473f7dff54 Author: Jiri Olsa AuthorDate: Tue, 12 Jan 2016 10:35:29 +0100 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 12 Jan 2016 11:13:52 -0300 perf stat: Fix recort_usage typo Markus reported gcc 6 complains when compiling perf stat command: builtin-stat.c:1591:27: error: ‘recort_usage’ defined but not used [-Werror=unused-const-variable] static const char * const recort_usage[] = { ^~~~~~~~~~~~ I fixed the typo and realized we already export record_usage, so I also prefixed it with stat (and included report_usage). Reported-by: Markus Trippelsdorf Signed-off-by: Jiri Olsa Cc: David Ahern Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1452591329-27620-1-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-stat.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index 7f56824..038e877 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -1588,7 +1588,7 @@ static int add_default_attributes(void) return perf_evlist__add_default_attrs(evsel_list, very_very_detailed_attrs); } -static const char * const recort_usage[] = { +static const char * const stat_record_usage[] = { "perf stat record []", NULL, }; @@ -1611,7 +1611,7 @@ static int __cmd_record(int argc, const char **argv) struct perf_session *session; struct perf_data_file *file = &perf_stat.file; - argc = parse_options(argc, argv, stat_options, record_usage, + argc = parse_options(argc, argv, stat_options, stat_record_usage, PARSE_OPT_STOP_AT_NON_OPTION); if (output_name) @@ -1745,7 +1745,7 @@ int process_cpu_map_event(struct perf_tool *tool __maybe_unused, return set_maps(st); } -static const char * const report_usage[] = { +static const char * const stat_report_usage[] = { "perf stat report []", NULL, }; @@ -1779,7 +1779,7 @@ static int __cmd_report(int argc, const char **argv) struct stat st; int ret; - argc = parse_options(argc, argv, options, report_usage, 0); + argc = parse_options(argc, argv, options, stat_report_usage, 0); if (!input_name || !strlen(input_name)) { if (!fstat(STDIN_FILENO, &st) && S_ISFIFO(st.st_mode))