From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753464AbbCFHcf (ORCPT ); Fri, 6 Mar 2015 02:32:35 -0500 Received: from mail4.hitachi.co.jp ([133.145.228.5]:60546 "EHLO mail4.hitachi.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932159AbbCFHc3 (ORCPT ); Fri, 6 Mar 2015 02:32:29 -0500 X-AuditID: 85900ec0-a0ec5b90000043ee-9c-54f957cd1308 Subject: [PATCH perf/core v2 3/5] Revert "perf probe: Fix to fall back to find probe point in symbols" From: Masami Hiramatsu To: Arnaldo Carvalho de Melo Cc: Naohiro Aota , Peter Zijlstra , Linux Kernel Mailing List , David Ahern , namhyung@kernel.org, Jiri Olsa , Ingo Molnar Date: Fri, 06 Mar 2015 16:31:25 +0900 Message-ID: <20150306073124.6904.1751.stgit@localhost.localdomain> In-Reply-To: <20150306073118.6904.72740.stgit@localhost.localdomain> References: <20150306073118.6904.72740.stgit@localhost.localdomain> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Brightmail-Tracker: AAAAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This reverts commit 906451b98b67 ("perf probe: Fix to fall back to find probe point in symbols"). Since perf-probe retries with the address of given symbol searched from map before this path, this fall back routine doesn't need anymore. Signed-off-by: Masami Hiramatsu --- 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);