Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

perf arm: Fix off-by-one directory paths.

Relative path include works in the regular build due to -I paths but may
fail in other situations.

v2. Rebase. Comments on v1 were that we should handle include paths
differently and it is agreed that can be a sensible refactor but
beyond the scope of this change.
https://lore.kernel.org/lkml/20210504191227.793712-1-irogers@google.com/

Signed-off-by: Ian Rogers <irogers@google.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: John Garry <john.garry@huawei.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Will Deacon <will@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org
Link: http://lore.kernel.org/lkml/20210923154254.737657-1-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

authored by

Ian Rogers and committed by
Arnaldo Carvalho de Melo
c6613bd4 774f2c08

+23 -23
+4 -4
tools/perf/arch/arm/util/auxtrace.c
··· 8 8 #include <linux/coresight-pmu.h> 9 9 #include <linux/zalloc.h> 10 10 11 - #include "../../util/auxtrace.h" 12 - #include "../../util/debug.h" 13 - #include "../../util/evlist.h" 14 - #include "../../util/pmu.h" 11 + #include "../../../util/auxtrace.h" 12 + #include "../../../util/debug.h" 13 + #include "../../../util/evlist.h" 14 + #include "../../../util/pmu.h" 15 15 #include "cs-etm.h" 16 16 #include "arm-spe.h" 17 17
+12 -12
tools/perf/arch/arm/util/cs-etm.c
··· 16 16 #include <linux/zalloc.h> 17 17 18 18 #include "cs-etm.h" 19 - #include "../../util/debug.h" 20 - #include "../../util/record.h" 21 - #include "../../util/auxtrace.h" 22 - #include "../../util/cpumap.h" 23 - #include "../../util/event.h" 24 - #include "../../util/evlist.h" 25 - #include "../../util/evsel.h" 26 - #include "../../util/perf_api_probe.h" 27 - #include "../../util/evsel_config.h" 28 - #include "../../util/pmu.h" 29 - #include "../../util/cs-etm.h" 19 + #include "../../../util/debug.h" 20 + #include "../../../util/record.h" 21 + #include "../../../util/auxtrace.h" 22 + #include "../../../util/cpumap.h" 23 + #include "../../../util/event.h" 24 + #include "../../../util/evlist.h" 25 + #include "../../../util/evsel.h" 26 + #include "../../../util/perf_api_probe.h" 27 + #include "../../../util/evsel_config.h" 28 + #include "../../../util/pmu.h" 29 + #include "../../../util/cs-etm.h" 30 30 #include <internal/lib.h> // page_size 31 - #include "../../util/session.h" 31 + #include "../../../util/session.h" 32 32 33 33 #include <errno.h> 34 34 #include <stdlib.h>
+1 -1
tools/perf/arch/arm/util/perf_regs.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0 2 - #include "../../util/perf_regs.h" 2 + #include "../../../util/perf_regs.h" 3 3 4 4 const struct sample_reg sample_reg_masks[] = { 5 5 SMPL_REG_END
+1 -1
tools/perf/arch/arm/util/pmu.c
··· 10 10 #include <linux/string.h> 11 11 12 12 #include "arm-spe.h" 13 - #include "../../util/pmu.h" 13 + #include "../../../util/pmu.h" 14 14 15 15 struct perf_event_attr 16 16 *perf_pmu__get_default_config(struct perf_pmu *pmu __maybe_unused)
+3 -3
tools/perf/arch/arm/util/unwind-libdw.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0 2 2 #include <elfutils/libdwfl.h> 3 - #include "../../util/unwind-libdw.h" 4 - #include "../../util/perf_regs.h" 5 - #include "../../util/event.h" 3 + #include "../../../util/unwind-libdw.h" 4 + #include "../../../util/perf_regs.h" 5 + #include "../../../util/event.h" 6 6 7 7 bool libdw__arch_set_initial_registers(Dwfl_Thread *thread, void *arg) 8 8 {
+2 -2
tools/perf/arch/arm/util/unwind-libunwind.c
··· 3 3 #include <errno.h> 4 4 #include <libunwind.h> 5 5 #include "perf_regs.h" 6 - #include "../../util/unwind.h" 7 - #include "../../util/debug.h" 6 + #include "../../../util/unwind.h" 7 + #include "../../../util/debug.h" 8 8 9 9 int libunwind__arch_reg_id(int regnum) 10 10 {