Received: by 10.223.185.116 with SMTP id b49csp1412673wrg; Sun, 11 Feb 2018 11:20:45 -0800 (PST) X-Google-Smtp-Source: AH8x226jiUo/4lelgHylBPVVQXARFpR8g348vtkB509Hw8YEAkS5cbqWTp4KyPCjZ1lzVvuJIWDV X-Received: by 2002:a17:902:b413:: with SMTP id x19-v6mr8538926plr.420.1518376845264; Sun, 11 Feb 2018 11:20:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518376845; cv=none; d=google.com; s=arc-20160816; b=vv7vDTds7zorMEjhUOtSHypf2FT7ocyZu9h6IcvMW9b3gq1IOLTqKCKOea9gsBug+v PNdLpQLR6IQljqJHsKi3Sd4PVsVjVngRqk61NvJMPRHhNzI5R1qiDBwGHLs0OPRjv5PV pXvuctNoYIXf17oQELJ8RaksJvBr/SIEVexGqHyKj6RUVhFtboLUA32WD92jwndF66/S S3CZsXY8wTEbORrFhQXf2aDq//5JVXNF5T/2I6M6VdUOkfpapOjpSnrwucDSipwYPzY/ nRmBBCTJ5jp9A7dNSosaGiBqmxoqVMreECRx03uBCdtKSDuAS3cjCT1jDFU+ZjM6rR0j xVIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:dkim-signature:message-id:date:subject:cc :to:from:arc-authentication-results; bh=uAWc1o9wdqRiIMt3SbBK1yXnNfNyk8hz5zx8hCFlV0o=; b=qDdMys5f24l8PP25TRq1vNUKHNcZ6eyM9j5oKcnN0HIdSLNDDybYNAzbhLH7qdTyrT z1tbLjCJTQpzYgwK66FuQ2Jck6BQhymWKWTKlH01pZWTIrI7eDdO8q5hxzZ04u+v3SBx 7DY0df8F0EkJ8UhRbHh8iX5Al0Pq667xwZtw7OaHGOPx8x/IcKbeFavtoWv3utu90cdk /jV4R6pKI+7K/srQM23VTFCXTLFTLMEOlPGlyaB2bbtitDHm/hdHoS3QUsHshOLdiqw3 VVskZMFLDy8dRFC/AWB22DnZfliOVl60yQi85pFPZcXDtWainkoxqGQoURdoRkNsAcIV ZylQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mx.aim.com header.s=20150623 header.b=iny3MMZv; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=aim.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z62si1274072pgd.688.2018.02.11.11.20.31; Sun, 11 Feb 2018 11:20:45 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@mx.aim.com header.s=20150623 header.b=iny3MMZv; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=aim.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753747AbeBKTTo (ORCPT + 99 others); Sun, 11 Feb 2018 14:19:44 -0500 Received: from omr-a019e.mx.aol.com ([204.29.186.67]:40167 "EHLO omr-a019e.mx.aol.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753726AbeBKTTn (ORCPT ); Sun, 11 Feb 2018 14:19:43 -0500 Received: from mtaout-mcc01.mx.aol.com (mtaout-mcc01.mx.aol.com [172.26.253.77]) by omr-a019e.mx.aol.com (Outbound Mail Relay) with ESMTP id B6C5F38000B3; Sun, 11 Feb 2018 14:19:42 -0500 (EST) Received: from thor.int.jpmvrealtime.com (CPE000db93f888c-CM001404556d28.cpe.net.cable.rogers.com [99.246.128.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mtaout-mcc01.mx.aol.com (MUA/Third Party Client Interface) with ESMTPSA id D8EF238000092; Sun, 11 Feb 2018 14:19:41 -0500 (EST) From: Martin Vuille To: Arnaldo Carvalho de Melo Cc: linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] perf annotate: Don't prepend symfs path to build_id_filename Date: Sun, 11 Feb 2018 14:19:37 -0500 Message-Id: <20180211191937.9703-1-jpmv27@aim.com> X-Mailer: git-send-email 2.13.6 x-aol-global-disposition: G DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mx.aim.com; s=20150623; t=1518376782; bh=uAWc1o9wdqRiIMt3SbBK1yXnNfNyk8hz5zx8hCFlV0o=; h=From:To:Subject:Message-Id:Date; b=iny3MMZvfZi6pKliKe0s/ypDRO5ZoD8TOpN+pDRpARsyoZiYmuGHjd5XfUnzrtTj1 Kq7Vo2+ddWyPbcjwszr7GkPn5ilzAqlO+Fpiodz0mitfUUa1znkpKX3g8FJmAfGu/N HR6Ui0628ro/urTWbYN+nhHjdHcBndxvjZ2FwwTY= x-aol-sid: 3039ac1afd4d5a80974d2b78 X-AOL-IP: 99.246.128.134 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org build_id_filename already contains symfs path if applicable, so don't prepend it a second time. Signed-off-by: Martin Vuille --- tools/perf/util/annotate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index 28b233c3dcbe..425b7f0760ec 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -1381,7 +1381,7 @@ static int dso__disassemble_filename(struct dso *dso, char *filename, size_t fil build_id_filename = dso__build_id_filename(dso, NULL, 0, false); if (build_id_filename) { - __symbol__join_symfs(filename, filename_size, build_id_filename); + scnprintf(filename, filename_size, "%s", build_id_filename); free(build_id_filename); } else { if (dso->has_build_id) -- 2.13.6