From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756619AbdCUGtu (ORCPT ); Tue, 21 Mar 2017 02:49:50 -0400 Received: from terminus.zytor.com ([65.50.211.136]:59922 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756508AbdCUGts (ORCPT ); Tue, 21 Mar 2017 02:49:48 -0400 Date: Mon, 20 Mar 2017 23:49:32 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: namhyung@kernel.org, mingo@kernel.org, dsahern@gmail.com, linux-kernel@vger.kernel.org, adrian.hunter@intel.com, acme@redhat.com, wangnan0@huawei.com, changbin.du@intel.com, jolsa@kernel.org, hpa@zytor.com, tglx@linutronix.de Reply-To: wangnan0@huawei.com, changbin.du@intel.com, acme@redhat.com, linux-kernel@vger.kernel.org, adrian.hunter@intel.com, dsahern@gmail.com, mingo@kernel.org, namhyung@kernel.org, hpa@zytor.com, tglx@linutronix.de, jolsa@kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf lock: Make 'f' part of the common 'lock_options' Git-Commit-ID: b40e36121e23031f1e8916a70110ffc841230670 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: b40e36121e23031f1e8916a70110ffc841230670 Gitweb: http://git.kernel.org/tip/b40e36121e23031f1e8916a70110ffc841230670 Author: Arnaldo Carvalho de Melo AuthorDate: Fri, 17 Mar 2017 11:16:02 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 17 Mar 2017 11:49:07 -0300 perf lock: Make 'f' part of the common 'lock_options' All options need the -f/--force option, so move it to the array referenced via OPT_PARENT. Cc: Adrian Hunter Cc: Changbin Du Cc: David Ahern Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-unbeionpi58rioh4e9w8kp4n@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-lock.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/perf/builtin-lock.c b/tools/perf/builtin-lock.c index 4ce815b..e992e72 100644 --- a/tools/perf/builtin-lock.c +++ b/tools/perf/builtin-lock.c @@ -952,6 +952,7 @@ int cmd_lock(int argc, const char **argv, const char *prefix __maybe_unused) OPT_STRING('i', "input", &input_name, "file", "input file name"), OPT_INCR('v', "verbose", &verbose, "be more verbose (show symbol address, etc)"), OPT_BOOLEAN('D', "dump-raw-trace", &dump_trace, "dump raw trace in ASCII"), + OPT_BOOLEAN('f', "force", &force, "don't complain, do it"), OPT_END() }; @@ -960,14 +961,12 @@ int cmd_lock(int argc, const char **argv, const char *prefix __maybe_unused) "dump thread list in perf.data"), OPT_BOOLEAN('m', "map", &info_map, "map of lock instances (address:name table)"), - OPT_BOOLEAN('f', "force", &force, "don't complain, do it"), OPT_PARENT(lock_options) }; const struct option report_options[] = { OPT_STRING('k', "key", &sort_key, "acquired", "key for sorting (acquired / contended / avg_wait / wait_total / wait_max / wait_min)"), - OPT_BOOLEAN('f', "force", &force, "don't complain, do it"), /* TODO: type */ OPT_PARENT(lock_options) };