Skip to contentSkip to conversation

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

PATCH Applied Ian Rogers 3 participants 3 messages Jan 14, 2022 perf events

lore
Share & tools
lore

Ian Rogers

author reviewer
#0 lore raw

PATCH 1/1 perf arm: Fix off-by-one directory path.

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

Fixes 83869019c74c ("perf arch: Support register names from all archs")
---
 tools/perf/util/arm64-frame-pointer-unwind-support.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/arm64-frame-pointer-unwind-support.c +1 -1
index 4f5ecf51ed38..2242a885fbd7 100644
@@ -6,7 +6,7 @@
 #include "unwind.h"
 
 #define perf_event_arm_regs perf_event_arm64_regs
-#include "../arch/arm64/include/uapi/asm/perf_regs.h"
+#include "../../arch/arm64/include/uapi/asm/perf_regs.h"
 #undef perf_event_arm_regs
 
 struct entries {
Signature · 1 line
2.34.1.703.g22d0c6ccf7-goog
Reviewed-by on v1 1/1
#1 lore raw

Hi Ian,

I think there's another include in "utils/intel-pt.c" that may need the same treatment.

Quoted 5 lines · Ian Rogers

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

Fixes 83869019c74c ("perf arch: Support register names from all archs")

Thanks,
German

Quoted 17 lines
---
 tools/perf/util/arm64-frame-pointer-unwind-support.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/arm64-frame-pointer-unwind-support.c +1 -1
index 4f5ecf51ed38..2242a885fbd7 100644
@@ -6,7 +6,7 @@
 #include "unwind.h"
 
 #define perf_event_arm_regs perf_event_arm64_regs
-#include "../arch/arm64/include/uapi/asm/perf_regs.h"
+#include "../../arch/arm64/include/uapi/asm/perf_regs.h"
 #undef perf_event_arm_regs
 
 struct entries {
maintainer Applied
#2 lore raw

Em Fri, Jan 14, 2022 at 09:26:29AM +0000, German Gomez escreveu:

Quoted 11 lines

Hi Ian,

I think there's another include in "utils/intel-pt.c" that may need the same treatment.

Quoted 5 lines · Ian Rogers

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

Fixes 83869019c74c ("perf arch: Support register names from all archs")

Thanks, applied.

- Arnaldo

Quoted 19 lines

Thanks,
German

Quoted 17 lines
---
 tools/perf/util/arm64-frame-pointer-unwind-support.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/arm64-frame-pointer-unwind-support.c +1 -1
index 4f5ecf51ed38..2242a885fbd7 100644
@@ -6,7 +6,7 @@
 #include "unwind.h"
 
 #define perf_event_arm_regs perf_event_arm64_regs
-#include "../arch/arm64/include/uapi/asm/perf_regs.h"
+#include "../../arch/arm64/include/uapi/asm/perf_regs.h"
 #undef perf_event_arm_regs
 
 struct entries {
Signature · 1 line
- Arnaldo