From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755110AbcBCKMl (ORCPT ); Wed, 3 Feb 2016 05:12:41 -0500 Received: from terminus.zytor.com ([198.137.202.10]:54461 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752609AbcBCKMS (ORCPT ); Wed, 3 Feb 2016 05:12:18 -0500 Date: Wed, 3 Feb 2016 02:11:37 -0800 From: tip-bot for Namhyung Kim Message-ID: Cc: acme@redhat.com, mingo@kernel.org, dsahern@gmail.com, peterz@infradead.org, tglx@linutronix.de, eranian@google.com, linux-kernel@vger.kernel.org, hpa@zytor.com, namhyung@kernel.org, andi@firstfloor.org, wangnan0@huawei.com Reply-To: acme@redhat.com, dsahern@gmail.com, mingo@kernel.org, peterz@infradead.org, tglx@linutronix.de, eranian@google.com, linux-kernel@vger.kernel.org, namhyung@kernel.org, hpa@zytor.com, wangnan0@huawei.com, andi@firstfloor.org In-Reply-To: <1452960197-5323-9-git-send-email-namhyung@kernel.org> References: <1452960197-5323-9-git-send-email-namhyung@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf hists browser: Only offer symbol scripting when a symbol is under the cursor Git-Commit-ID: c221acb0f970d3b80d72c812cda19c121acf5d52 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: c221acb0f970d3b80d72c812cda19c121acf5d52 Gitweb: http://git.kernel.org/tip/c221acb0f970d3b80d72c812cda19c121acf5d52 Author: Namhyung Kim AuthorDate: Thu, 21 Jan 2016 19:50:09 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 26 Jan 2016 11:52:49 -0300 perf hists browser: Only offer symbol scripting when a symbol is under the cursor When this feature was introduced a check was made if there was a resolved symbol under the cursor, it got lost in commit ea7cd5923309 ("perf hists browser: Split popup menu actions - part 2"), reinstate it. Signed-off-by: Namhyung Kim Tested-by: Arnaldo Carvalho de Melo Cc: Andi Kleen Cc: David Ahern Cc: Jiri Olsa , Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Wang Nan Fixes: ea7cd5923309 ("perf hists browser: Split popup menu actions - part 2") Link: http://lkml.kernel.org/r/1452960197-5323-9-git-send-email-namhyung@kernel.org [ Carved out from a larger patch ] Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/ui/browsers/hists.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c index e66b3a3..2801d80 100644 --- a/tools/perf/ui/browsers/hists.c +++ b/tools/perf/ui/browsers/hists.c @@ -2322,10 +2322,12 @@ skip_annotation: * * See hist_browser__show_entry. */ - nr_options += add_script_opt(browser, - &actions[nr_options], - &options[nr_options], - NULL, browser->selection->sym); + if (sort__has_sym && browser->selection->sym) { + nr_options += add_script_opt(browser, + &actions[nr_options], + &options[nr_options], + NULL, browser->selection->sym); + } } nr_options += add_script_opt(browser, &actions[nr_options], &options[nr_options], NULL, NULL);