2022-01-14 06:48:29

by Ian Rogers

Subject: [PATCH] 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")
Signed-off-by: Ian Rogers <[email protected]>
---
tools/perf/util/arm64-frame-pointer-unwind-support.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/util/arm64-frame-pointer-unwind-support.c b/tools/perf/util/arm64-frame-pointer-unwind-support.c
index 4f5ecf51ed38..2242a885fbd7 100644
--- a/tools/perf/util/arm64-frame-pointer-unwind-support.c
+++ b/tools/perf/util/arm64-frame-pointer-unwind-support.c
@@ -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 {
--
2.34.1.703.g22d0c6ccf7-goog

2022-01-14 09:26:42

by German Gomez

Subject: Re: [PATCH] perf arm: Fix off-by-one directory path.

Hi Ian,

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

On 14/01/2022 06:48, Ian Rogers wrote:
> 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")
> Signed-off-by: Ian Rogers <[email protected]>
Reviewed-by: German Gomez <[email protected]>

Thanks,
German
> ---
> tools/perf/util/arm64-frame-pointer-unwind-support.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/perf/util/arm64-frame-pointer-unwind-support.c b/tools/perf/util/arm64-frame-pointer-unwind-support.c
> index 4f5ecf51ed38..2242a885fbd7 100644
> --- a/tools/perf/util/arm64-frame-pointer-unwind-support.c
> +++ b/tools/perf/util/arm64-frame-pointer-unwind-support.c
> @@ -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 {

2022-01-14 21:33:00

by Arnaldo Carvalho de Melo

Subject: Re: [PATCH] perf arm: Fix off-by-one directory path.

Em Fri, Jan 14, 2022 at 09:26:29AM +0000, German Gomez escreveu:
> Hi Ian,
>
> I think there's another include in "utils/intel-pt.c" that may need the same treatment.
>
> On 14/01/2022 06:48, Ian Rogers wrote:
> > 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")
> > Signed-off-by: Ian Rogers <[email protected]>
> Reviewed-by: German Gomez <[email protected]>

Thanks, applied.

- Arnaldo


> Thanks,
> German
> > ---
> > tools/perf/util/arm64-frame-pointer-unwind-support.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/tools/perf/util/arm64-frame-pointer-unwind-support.c b/tools/perf/util/arm64-frame-pointer-unwind-support.c
> > index 4f5ecf51ed38..2242a885fbd7 100644
> > --- a/tools/perf/util/arm64-frame-pointer-unwind-support.c
> > +++ b/tools/perf/util/arm64-frame-pointer-unwind-support.c
> > @@ -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 {

--

- Arnaldo