From patchwork Tue May 4 19:12:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 12238515 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 53132C433B4 for ; Tue, 4 May 2021 19:14:19 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9FC30610E9 for ; Tue, 4 May 2021 19:14:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9FC30610E9 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Cc:To:From:Subject:Mime-Version:Message-Id:Date: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=V+oR9hKCvcxTuNBn8UDETE1fQgexqGP1CDTEzns8Jg8=; b=qeIha5TkNGUG58bdFQF15ZcBTF ndC3QKTzLEx7uJiRDGGF7jviAXrcqV7ksCEHPPibHL6NKcHLJ2myn05BOydnQnWnevH7KSeCX3nrJ L9n9DJXsmB3NKtr7Cuus0SzqsIQPcSS7ZbkJn5Zw7XmJ32XZnkivHGfcjBiiJTDHF8zQDlQNWOUnv JmD+gKlYUVE76TAC4YrIXo7xVVIVVK2mI16XJUzzadBrk3jQ+AvXelmU1Y7+Fpp3w/BVefLOy6tB2 8u9LQX5GJGIZKawkHDrPL8Bp+BwX05xl1X8ETn7dwIh/9LzCWzbvesXSYfBZXQ3Kcx1oDDDKsg0bI uKepdxzA==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1le0TM-00GreQ-7m; Tue, 04 May 2021 19:12:46 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1le0TE-00GrdF-Af for linux-arm-kernel@desiato.infradead.org; Tue, 04 May 2021 19:12:36 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Type:Cc:To:From:Subject: Mime-Version:Message-Id:Date:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:In-Reply-To:References; bh=DPQoY+5BFGMPSoMOLLW+zrHnpLhcIS8wpMva4HHTy1Q=; b=hvdp9UY0RvboEdY8m0SohOx4ba wDlbxUcWpCsVMiYaHEdAlQj+ysjfZfQlz/GCjGG7+i9QzraqJ49En/iwnNNWQwcjMR3R9/dpTXBJA NJtiWgPwDQBA+RU13FQIAtU4xajOB/efiQop37mKjsJXI6MqecPjV08xHkgnH+Tf8xOCivzKq1dQC EM4vKMhNjL0TC6ag1Ffaq0u1aIvdoVaIjiz5YwYUkSfZ/esublAvBNfT3rgKg1sp8xVqX1iOabZIZ u7rs6uHP+wymLfj9OpMOHiUA/t5WsMFK5HfuqYpAjzN00EB2aVHtwIusoV6hLCa5qqbUklSmzg1Xu nkStDgnA==; Received: from mail-yb1-xb4a.google.com ([2607:f8b0:4864:20::b4a]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1le0TB-004Cyn-FF for linux-arm-kernel@lists.infradead.org; Tue, 04 May 2021 19:12:35 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id x186-20020a25e0c30000b02904f0d007a955so12923630ybg.12 for ; Tue, 04 May 2021 12:12:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=DPQoY+5BFGMPSoMOLLW+zrHnpLhcIS8wpMva4HHTy1Q=; b=DmMzNprx4BqDHLMu8jBGuQmT//Eu8g141YmQyTsvDtwk6nFFzYg5OXgfbEfG2s0agV N6LUzBZMgiYungbu2izdEpHDJ9zxekANw/+uVWYeao+5At9AkFgvyxlIJGX0j/rPFjF1 iMLva4cQ68XAkNkqz6H7lxzKLQ4+/rubhsEBpVCjA88UtXfOOGEIgyAuL8PF1Ij6r2Cc YLpRYABfwULyKk9/XFMyrdOv6AMceith4AywxPtRg3AVXWlBW5T8/CXGPQtPc3mkFNtD eIEhLgXYFBOmt0vHNTzoCTAhOhFnkFMje2ItjxZLuXUElo10KpOQ4GrNgcJJQswjB8BZ j7lQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=DPQoY+5BFGMPSoMOLLW+zrHnpLhcIS8wpMva4HHTy1Q=; b=C7PQ+hYpu/6rncbtqNs0PVXK/iB1+NhQpnCO7WDHnDm7Ravx0GIq7UmTiTpZyzJdcj 8Ey7PbkTlzMFmQFHyQhvZWWx9bRH2VY0EGBr225U9nP9u+Ge8pKETgXcWEWLCWx2Y13O G2N114aU6zaqajHAbap/hIuiIB4V5h23cN9n4zKXFNUO5A5olNfktfDGYWhplpMBb9E4 y0GXXAixbN7Hicu/Z9GZeT51zA6Q8Cm4hSdbb7FilWeMEAclYhVbH+gEqGs4dtAaPaXU PWYsUZMEbzORwl2A/dPpHRhFn/jl/3N/p2mXRd6NcXJeb6zpL3MGEwnrOVMGXnUXFRyO +NfQ== X-Gm-Message-State: AOAM533K3qX//iWaBdIcwwBJtpHui1IG5TvlAHtei0Sq0cjnDnmUaICZ rwlBwnIm5iYq3+LkT+G5rKxYQoYmndO3 X-Google-Smtp-Source: ABdhPJzYMNj5d0iA145d5Ox3Cz69OkPKW1/6qR9n7oxIpGfTwIyFVEQ98t5cbgS+AFcsWyUlfxxj374Nkt5J X-Received: from irogers.svl.corp.google.com ([2620:15c:2cd:202:6f05:c90a:7892:8680]) (user=irogers job=sendgmr) by 2002:a25:b223:: with SMTP id i35mr34061518ybj.429.1620155551491; Tue, 04 May 2021 12:12:31 -0700 (PDT) Date: Tue, 4 May 2021 12:12:27 -0700 Message-Id: <20210504191227.793712-1-irogers@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.31.1.607.g51e8a6a459-goog Subject: [PATCH] perf arm: Fix off-by-one directory paths. From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Leo Yan , John Garry , Will Deacon , Mathieu Poirier , Sergey Senozhatsky , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Stephane Eranian , Ian Rogers X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210504_121233_547252_77D6D53E X-CRM114-Status: GOOD ( 14.46 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Relative path include works in the regular build due to -I paths but may fail in other situations. Signed-off-by: Ian Rogers --- tools/perf/arch/arm/util/auxtrace.c | 8 +++---- tools/perf/arch/arm/util/cs-etm.c | 24 ++++++++++----------- tools/perf/arch/arm/util/perf_regs.c | 2 +- tools/perf/arch/arm/util/pmu.c | 2 +- tools/perf/arch/arm/util/unwind-libdw.c | 6 +++--- tools/perf/arch/arm/util/unwind-libunwind.c | 4 ++-- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/tools/perf/arch/arm/util/auxtrace.c b/tools/perf/arch/arm/util/auxtrace.c index b187bddbd01a..7ed57222465e 100644 --- a/tools/perf/arch/arm/util/auxtrace.c +++ b/tools/perf/arch/arm/util/auxtrace.c @@ -8,10 +8,10 @@ #include #include -#include "../../util/auxtrace.h" -#include "../../util/debug.h" -#include "../../util/evlist.h" -#include "../../util/pmu.h" +#include "../../../util/auxtrace.h" +#include "../../../util/debug.h" +#include "../../../util/evlist.h" +#include "../../../util/pmu.h" #include "cs-etm.h" #include "arm-spe.h" diff --git a/tools/perf/arch/arm/util/cs-etm.c b/tools/perf/arch/arm/util/cs-etm.c index d942f118d32c..67c7fb8d7eb0 100644 --- a/tools/perf/arch/arm/util/cs-etm.c +++ b/tools/perf/arch/arm/util/cs-etm.c @@ -16,19 +16,19 @@ #include #include "cs-etm.h" -#include "../../util/debug.h" -#include "../../util/record.h" -#include "../../util/auxtrace.h" -#include "../../util/cpumap.h" -#include "../../util/event.h" -#include "../../util/evlist.h" -#include "../../util/evsel.h" -#include "../../util/perf_api_probe.h" -#include "../../util/evsel_config.h" -#include "../../util/pmu.h" -#include "../../util/cs-etm.h" +#include "../../../util/debug.h" +#include "../../../util/record.h" +#include "../../../util/auxtrace.h" +#include "../../../util/cpumap.h" +#include "../../../util/event.h" +#include "../../../util/evlist.h" +#include "../../../util/evsel.h" +#include "../../../util/perf_api_probe.h" +#include "../../../util/evsel_config.h" +#include "../../../util/pmu.h" +#include "../../../util/cs-etm.h" #include // page_size -#include "../../util/session.h" +#include "../../../util/session.h" #include #include diff --git a/tools/perf/arch/arm/util/perf_regs.c b/tools/perf/arch/arm/util/perf_regs.c index 2864e2e3776d..2833e101a7c6 100644 --- a/tools/perf/arch/arm/util/perf_regs.c +++ b/tools/perf/arch/arm/util/perf_regs.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -#include "../../util/perf_regs.h" +#include "../../../util/perf_regs.h" const struct sample_reg sample_reg_masks[] = { SMPL_REG_END diff --git a/tools/perf/arch/arm/util/pmu.c b/tools/perf/arch/arm/util/pmu.c index bbc297a7e2e3..b8b23b9dc598 100644 --- a/tools/perf/arch/arm/util/pmu.c +++ b/tools/perf/arch/arm/util/pmu.c @@ -10,7 +10,7 @@ #include #include "arm-spe.h" -#include "../../util/pmu.h" +#include "../../../util/pmu.h" struct perf_event_attr *perf_pmu__get_default_config(struct perf_pmu *pmu __maybe_unused) diff --git a/tools/perf/arch/arm/util/unwind-libdw.c b/tools/perf/arch/arm/util/unwind-libdw.c index 36ba4c69c3c5..b7692cb0c733 100644 --- a/tools/perf/arch/arm/util/unwind-libdw.c +++ b/tools/perf/arch/arm/util/unwind-libdw.c @@ -1,8 +1,8 @@ // SPDX-License-Identifier: GPL-2.0 #include -#include "../../util/unwind-libdw.h" -#include "../../util/perf_regs.h" -#include "../../util/event.h" +#include "../../../util/unwind-libdw.h" +#include "../../../util/perf_regs.h" +#include "../../../util/event.h" bool libdw__arch_set_initial_registers(Dwfl_Thread *thread, void *arg) { diff --git a/tools/perf/arch/arm/util/unwind-libunwind.c b/tools/perf/arch/arm/util/unwind-libunwind.c index 3a550225dfaf..438906bf0014 100644 --- a/tools/perf/arch/arm/util/unwind-libunwind.c +++ b/tools/perf/arch/arm/util/unwind-libunwind.c @@ -3,8 +3,8 @@ #include #include #include "perf_regs.h" -#include "../../util/unwind.h" -#include "../../util/debug.h" +#include "../../../util/unwind.h" +#include "../../../util/debug.h" int libunwind__arch_reg_id(int regnum) {