diff mbox series

[v3,1/5] perf tools: arm64: Use perf's copy of kernel headers

Message ID 20220525154114.718321-2-james.clark@arm.com (mailing list archive)
State New, archived
Headers show
Series perf: arm64: Tools support for Dwarf unwinding through SVE functions | expand

Commit Message

James Clark May 25, 2022, 3:41 p.m. UTC
Fix this include path to use perf's copy of the kernel header
rather than the one from the root of the repo.

This fixes build errors when only applying the perf tools
part of a patchset rather than both sides.

Reported-by: German Gomez <german.gomez@arm.com>
Signed-off-by: James Clark <james.clark@arm.com>
---
 tools/perf/util/libunwind/arm64.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

German Gomez May 25, 2022, 3:59 p.m. UTC | #1
On 25/05/2022 16:41, James Clark wrote:
> Fix this include path to use perf's copy of the kernel header
> rather than the one from the root of the repo.
>
> This fixes build errors when only applying the perf tools
> part of a patchset rather than both sides.
>
> Reported-by: German Gomez <german.gomez@arm.com>
> Signed-off-by: James Clark <james.clark@arm.com>

Without this change "make -C tools/perf" was failing if kernel-side changes weren't applied

Tested-by: German Gomez <german.gomez@arm.com>

Thanks,
German

> ---
>  tools/perf/util/libunwind/arm64.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/perf/util/libunwind/arm64.c b/tools/perf/util/libunwind/arm64.c
> index 15f60fd09424..014d82159656 100644
> --- a/tools/perf/util/libunwind/arm64.c
> +++ b/tools/perf/util/libunwind/arm64.c
> @@ -24,7 +24,7 @@
>  #include "unwind.h"
>  #include "libunwind-aarch64.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
>  #include "../../arch/arm64/util/unwind-libunwind.c"
>
Ian Rogers June 2, 2022, 6:08 p.m. UTC | #2
On Wed, May 25, 2022 at 8:59 AM German Gomez <german.gomez@arm.com> wrote:
>
>
> On 25/05/2022 16:41, James Clark wrote:
> > Fix this include path to use perf's copy of the kernel header
> > rather than the one from the root of the repo.
> >
> > This fixes build errors when only applying the perf tools
> > part of a patchset rather than both sides.
> >
> > Reported-by: German Gomez <german.gomez@arm.com>
> > Signed-off-by: James Clark <james.clark@arm.com>
>
> Without this change "make -C tools/perf" was failing if kernel-side changes weren't applied
>
> Tested-by: German Gomez <german.gomez@arm.com>
>
> Thanks,
> German

Acked-by: Ian Rogers <irogers@google.com>

Thanks,
Ian

> > ---
> >  tools/perf/util/libunwind/arm64.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/tools/perf/util/libunwind/arm64.c b/tools/perf/util/libunwind/arm64.c
> > index 15f60fd09424..014d82159656 100644
> > --- a/tools/perf/util/libunwind/arm64.c
> > +++ b/tools/perf/util/libunwind/arm64.c
> > @@ -24,7 +24,7 @@
> >  #include "unwind.h"
> >  #include "libunwind-aarch64.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
> >  #include "../../arch/arm64/util/unwind-libunwind.c"
> >
diff mbox series

Patch

diff --git a/tools/perf/util/libunwind/arm64.c b/tools/perf/util/libunwind/arm64.c
index 15f60fd09424..014d82159656 100644
--- a/tools/perf/util/libunwind/arm64.c
+++ b/tools/perf/util/libunwind/arm64.c
@@ -24,7 +24,7 @@ 
 #include "unwind.h"
 #include "libunwind-aarch64.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
 #include "../../arch/arm64/util/unwind-libunwind.c"