From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752665AbcETRq2 (ORCPT ); Fri, 20 May 2016 13:46:28 -0400 Received: from terminus.zytor.com ([198.137.202.10]:33700 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751327AbcETRqZ (ORCPT ); Fri, 20 May 2016 13:46:25 -0400 Date: Fri, 20 May 2016 10:46:05 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: milian.wolff@kdab.com, jolsa@kernel.org, namhyung@kernel.org, adrian.hunter@intel.com, linux-kernel@vger.kernel.org, dsahern@gmail.com, acme@redhat.com, mingo@kernel.org, wangnan0@huawei.com, tglx@linutronix.de, hpa@zytor.com Reply-To: acme@redhat.com, mingo@kernel.org, dsahern@gmail.com, linux-kernel@vger.kernel.org, adrian.hunter@intel.com, namhyung@kernel.org, jolsa@kernel.org, milian.wolff@kdab.com, hpa@zytor.com, tglx@linutronix.de, wangnan0@huawei.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf trace: Only auto set call-graph to "dwarf" when syscalls are being traced Git-Commit-ID: caa36ed7ba82caa9f685dd04aa10d0bf87ea8b6a 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: caa36ed7ba82caa9f685dd04aa10d0bf87ea8b6a Gitweb: http://git.kernel.org/tip/caa36ed7ba82caa9f685dd04aa10d0bf87ea8b6a Author: Arnaldo Carvalho de Melo AuthorDate: Thu, 19 May 2016 19:00:27 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 20 May 2016 11:43:57 -0300 perf trace: Only auto set call-graph to "dwarf" when syscalls are being traced When --min-stack or --max-stack is passwd but --no-syscalls is also in effect, there is no point in automatically setting '--call-graph dwarf'. Cc: Adrian Hunter Cc: David Ahern Cc: Jiri Olsa Cc: Milian Wolff Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-pq922i7h9wef0pho1dqpttvn@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index 7401de7..487c104 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c @@ -2910,7 +2910,7 @@ int cmd_trace(int argc, const char **argv, const char *prefix __maybe_unused) } #ifdef HAVE_DWARF_UNWIND_SUPPORT - if ((trace.min_stack || max_stack_user_set) && !callchain_param.enabled) + if ((trace.min_stack || max_stack_user_set) && !callchain_param.enabled && trace.trace_syscalls) record_opts__parse_callchain(&trace.opts, &callchain_param, "dwarf", false); #endif