From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754768AbcKOKl1 (ORCPT ); Tue, 15 Nov 2016 05:41:27 -0500 Received: from terminus.zytor.com ([198.137.202.10]:50642 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752446AbcKOKlX (ORCPT ); Tue, 15 Nov 2016 05:41:23 -0500 Date: Tue, 15 Nov 2016 02:40:53 -0800 From: tip-bot for Rabin Vincent Message-ID: Cc: mingo@kernel.org, rabinv@axis.com, acme@redhat.com, linux-kernel@vger.kernel.org, hekuang@huawei.com, hpa@zytor.com, tglx@linutronix.de Reply-To: mingo@kernel.org, tglx@linutronix.de, hpa@zytor.com, acme@redhat.com, hekuang@huawei.com, linux-kernel@vger.kernel.org, rabinv@axis.com In-Reply-To: <1470837148-7642-1-git-send-email-rabin.vincent@axis.com> References: <1470837148-7642-1-git-send-email-rabin.vincent@axis.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf callchain: Fixup help/config for no-unwinding Git-Commit-ID: c56cb33b56c13493eeb95612f80e4dd6e35cd109 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: c56cb33b56c13493eeb95612f80e4dd6e35cd109 Gitweb: http://git.kernel.org/tip/c56cb33b56c13493eeb95612f80e4dd6e35cd109 Author: Rabin Vincent AuthorDate: Wed, 10 Aug 2016 15:52:28 +0200 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 7 Nov 2016 22:13:47 -0300 perf callchain: Fixup help/config for no-unwinding Since 841e3558b2d ("perf callchain: Recording 'dwarf' callchains do not need DWARF unwinding support"), --call-graph dwarf is allowed in 'perf record' even without unwind support. A couple of other places don't reflect this yet though: the help text should list dwarf as a valid record mode and the dump_size config should be respected too. Signed-off-by: Rabin Vincent Cc: He Kuang Fixes: 841e3558b2de ("perf callchain: Recording 'dwarf' callchains do not need DWARF unwinding support") Link: http://lkml.kernel.org/r/1470837148-7642-1-git-send-email-rabin.vincent@axis.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/callchain.c | 2 -- tools/perf/util/callchain.h | 4 ---- 2 files changed, 6 deletions(-) diff --git a/tools/perf/util/callchain.c b/tools/perf/util/callchain.c index 07fd30b..ae58b49 100644 --- a/tools/perf/util/callchain.c +++ b/tools/perf/util/callchain.c @@ -193,7 +193,6 @@ int perf_callchain_config(const char *var, const char *value) if (!strcmp(var, "record-mode")) return parse_callchain_record_opt(value, &callchain_param); -#ifdef HAVE_DWARF_UNWIND_SUPPORT if (!strcmp(var, "dump-size")) { unsigned long size = 0; int ret; @@ -203,7 +202,6 @@ int perf_callchain_config(const char *var, const char *value) return ret; } -#endif if (!strcmp(var, "print-type")) return parse_callchain_mode(value); if (!strcmp(var, "order")) diff --git a/tools/perf/util/callchain.h b/tools/perf/util/callchain.h index 13e7554..47cfd10 100644 --- a/tools/perf/util/callchain.h +++ b/tools/perf/util/callchain.h @@ -11,11 +11,7 @@ #define CALLCHAIN_HELP "setup and enables call-graph (stack chain/backtrace):\n\n" -#ifdef HAVE_DWARF_UNWIND_SUPPORT # define RECORD_MODE_HELP HELP_PAD "record_mode:\tcall graph recording mode (fp|dwarf|lbr)\n" -#else -# define RECORD_MODE_HELP HELP_PAD "record_mode:\tcall graph recording mode (fp|lbr)\n" -#endif #define RECORD_SIZE_HELP \ HELP_PAD "record_size:\tif record_mode is 'dwarf', max size of stack recording ()\n" \