Re: [PATCH] perf arm64: Fix off-by-one directory paths.

[Arnaldo Carvalho de Melo]

Em Fri, Apr 16, 2021 at 02:41:13PM -0700, Ian Rogers escreveu:
> Relative path include works in the regular build due to -I paths but may
> break in other situations.

Thanks, applied.

- Arnaldo

 
> Signed-off-by: Ian Rogers <irogers@xxxxxxxxxx>
> ---
>  tools/perf/arch/arm64/util/kvm-stat.c         | 4 ++--
>  tools/perf/arch/arm64/util/pmu.c              | 4 ++--
>  tools/perf/arch/arm64/util/unwind-libunwind.c | 4 ++--
>  3 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/tools/perf/arch/arm64/util/kvm-stat.c b/tools/perf/arch/arm64/util/kvm-stat.c
> index 50376b9062c1..2303256b7d05 100644
> --- a/tools/perf/arch/arm64/util/kvm-stat.c
> +++ b/tools/perf/arch/arm64/util/kvm-stat.c
> @@ -1,8 +1,8 @@
>  // SPDX-License-Identifier: GPL-2.0
>  #include <errno.h>
>  #include <memory.h>
> -#include "../../util/evsel.h"
> -#include "../../util/kvm-stat.h"
> +#include "../../../util/evsel.h"
> +#include "../../../util/kvm-stat.h"
>  #include "arm64_exception_types.h"
>  #include "debug.h"
>  
> diff --git a/tools/perf/arch/arm64/util/pmu.c b/tools/perf/arch/arm64/util/pmu.c
> index d3259d61ca75..2234fbd0a912 100644
> --- a/tools/perf/arch/arm64/util/pmu.c
> +++ b/tools/perf/arch/arm64/util/pmu.c
> @@ -1,7 +1,7 @@
>  // SPDX-License-Identifier: GPL-2.0
>  
> -#include "../../util/cpumap.h"
> -#include "../../util/pmu.h"
> +#include "../../../util/cpumap.h"
> +#include "../../../util/pmu.h"
>  
>  struct pmu_events_map *pmu_events_map__find(void)
>  {
> diff --git a/tools/perf/arch/arm64/util/unwind-libunwind.c b/tools/perf/arch/arm64/util/unwind-libunwind.c
> index 1495a9523a23..5aecf88e3de6 100644
> --- a/tools/perf/arch/arm64/util/unwind-libunwind.c
> +++ b/tools/perf/arch/arm64/util/unwind-libunwind.c
> @@ -4,9 +4,9 @@
>  #ifndef REMOTE_UNWIND_LIBUNWIND
>  #include <libunwind.h>
>  #include "perf_regs.h"
> -#include "../../util/unwind.h"
> +#include "../../../util/unwind.h"
>  #endif
> -#include "../../util/debug.h"
> +#include "../../../util/debug.h"
>  
>  int LIBUNWIND__ARCH_REG_ID(int regnum)
>  {
> -- 
> 2.31.1.368.gbe11c130af-goog
> 

-- 

- Arnaldo