From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753200AbbLNIhc (ORCPT ); Mon, 14 Dec 2015 03:37:32 -0500 Received: from terminus.zytor.com ([198.137.202.10]:52545 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753142AbbLNIh2 (ORCPT ); Mon, 14 Dec 2015 03:37:28 -0500 Date: Mon, 14 Dec 2015 00:37:13 -0800 From: tip-bot for Namhyung Kim Message-ID: Cc: linux-kernel@vger.kernel.org, tglx@linutronix.de, mingo@kernel.org, a.p.zijlstra@chello.nl, jolsa@redhat.com, dsahern@gmail.com, namhyung@kernel.org, acme@redhat.com, hpa@zytor.com Reply-To: a.p.zijlstra@chello.nl, jolsa@redhat.com, dsahern@gmail.com, namhyung@kernel.org, acme@redhat.com, hpa@zytor.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, mingo@kernel.org In-Reply-To: <1449802616-16170-3-git-send-email-namhyung@kernel.org> References: <1449802616-16170-3-git-send-email-namhyung@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf top: Fix annotation on --stdio Git-Commit-ID: 448f13b2d18fdc8dbaada97442e8954dcb4ef8fa 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: 448f13b2d18fdc8dbaada97442e8954dcb4ef8fa Gitweb: http://git.kernel.org/tip/448f13b2d18fdc8dbaada97442e8954dcb4ef8fa Author: Namhyung Kim AuthorDate: Fri, 11 Dec 2015 11:56:55 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 11 Dec 2015 08:36:18 -0300 perf top: Fix annotation on --stdio The ui__has_annotation() inside perf_top__record_precise_ip() should be removed since it returns true only for TUI (and when sort key has symbol). However the 'perf top --stdio' also supports annotation for a symbol which was specified by 's' key action. Actually it already does the necessary checks before calling the function. So it's ok to get rid of the check here. Signed-off-by: Namhyung Kim Cc: David Ahern Cc: Jiri Olsa Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1449802616-16170-3-git-send-email-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-top.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c index 586798a..f447e55 100644 --- a/tools/perf/builtin-top.c +++ b/tools/perf/builtin-top.c @@ -189,8 +189,7 @@ static void perf_top__record_precise_ip(struct perf_top *top, if (pthread_mutex_trylock(¬es->lock)) return; - if (ui__has_annotation()) - err = hist_entry__inc_addr_samples(he, counter, ip); + err = hist_entry__inc_addr_samples(he, counter, ip); pthread_mutex_unlock(¬es->lock);