From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756563AbbCNHEX (ORCPT ); Sat, 14 Mar 2015 03:04:23 -0400 Received: from terminus.zytor.com ([198.137.202.10]:40216 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751379AbbCNHER (ORCPT ); Sat, 14 Mar 2015 03:04:17 -0400 Date: Sat, 14 Mar 2015 00:03:07 -0700 From: tip-bot for Masami Hiramatsu Message-ID: Cc: peterz@infradead.org, naota@elisp.net, hpa@zytor.com, masami.hiramatsu.pt@hitachi.com, namhyung@kernel.org, dsahern@gmail.com, tglx@linutronix.de, acme@redhat.com, mingo@kernel.org, jolsa@redhat.com, linux-kernel@vger.kernel.org Reply-To: masami.hiramatsu.pt@hitachi.com, naota@elisp.net, peterz@infradead.org, hpa@zytor.com, acme@redhat.com, mingo@kernel.org, dsahern@gmail.com, namhyung@kernel.org, tglx@linutronix.de, jolsa@redhat.com, linux-kernel@vger.kernel.org In-Reply-To: <20150306073124.6904.1751.stgit@localhost.localdomain> References: <20150306073124.6904.1751.stgit@localhost.localdomain> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] Revert "perf probe: Fix to fall back to find probe point in symbols" Git-Commit-ID: 0687eba7872d7dbe01b074c54359315e97502360 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: 0687eba7872d7dbe01b074c54359315e97502360 Gitweb: http://git.kernel.org/tip/0687eba7872d7dbe01b074c54359315e97502360 Author: Masami Hiramatsu AuthorDate: Fri, 6 Mar 2015 16:31:25 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 12 Mar 2015 12:39:53 -0300 Revert "perf probe: Fix to fall back to find probe point in symbols" This reverts commit 906451b98b67 ("perf probe: Fix to fall back to find probe point in symbols"). Since 'perf probe' now retries with the address of given symbol searched from map before this path, this fall back routine isn't needed anymore. Signed-off-by: Masami Hiramatsu Cc: David Ahern Cc: Ingo Molnar Cc: Jiri Olsa Cc: Namhyung Kim Cc: Naohiro Aota Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/20150306073124.6904.1751.stgit@localhost.localdomain Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/probe-event.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c index 4cfd121..c379ea0 100644 --- a/tools/perf/util/probe-event.c +++ b/tools/perf/util/probe-event.c @@ -630,11 +630,9 @@ static int try_to_find_probe_trace_events(struct perf_probe_event *pev, } if (ntevs == 0) { /* No error but failed to find probe point. */ - pr_warning("Probe point '%s' not found in debuginfo.\n", + pr_warning("Probe point '%s' not found.\n", synthesize_perf_probe_point(&pev->point)); - if (need_dwarf) - return -ENOENT; - return 0; + return -ENOENT; } /* Error path : ntevs < 0 */ pr_debug("An error occurred in debuginfo analysis (%d).\n", ntevs);