2022-12-31 05:45:41

by Eric Lin

Subject: [PATCH] perf tools riscv: Fix perf tool build error on riscv

Since the definition of 'struct perf_sample' has been moved to sample.h,
we need to include this header file to fix the build error as follows:

arch/riscv/util/unwind-libdw.c: In function 'libdw__arch_set_initial_registers':
arch/riscv/util/unwind-libdw.c:12:50: error: invalid use of undefined type 'struct perf_sample'
12 | struct regs_dump *user_regs = &ui->sample->user_regs;
| ^~

Fixes: 9823147da6c8 ("perf tools: Move 'struct perf_sample' to a separate header file to disentangle headers")
Signed-off-by: Eric Lin <[email protected]>
---
tools/perf/arch/riscv/util/unwind-libdw.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/arch/riscv/util/unwind-libdw.c b/tools/perf/arch/riscv/util/unwind-libdw.c
index 19536e172850..54a198714eb8 100644
--- a/tools/perf/arch/riscv/util/unwind-libdw.c
+++ b/tools/perf/arch/riscv/util/unwind-libdw.c
@@ -4,7 +4,7 @@
#include <elfutils/libdwfl.h>
#include "../../util/unwind-libdw.h"
#include "../../util/perf_regs.h"
-#include "../../util/event.h"
+#include "../../util/sample.h"

bool libdw__arch_set_initial_registers(Dwfl_Thread *thread, void *arg)
{
--
2.17.1

2023-01-02 15:01:58

by Arnaldo Carvalho de Melo

Subject: Re: [PATCH] perf tools riscv: Fix perf tool build error on riscv

Em Sat, Dec 31, 2022 at 05:27:31AM +0000, Eric Lin escreveu:
> Since the definition of 'struct perf_sample' has been moved to sample.h,
> we need to include this header file to fix the build error as follows:
>
> arch/riscv/util/unwind-libdw.c: In function 'libdw__arch_set_initial_registers':
> arch/riscv/util/unwind-libdw.c:12:50: error: invalid use of undefined type 'struct perf_sample'
> 12 | struct regs_dump *user_regs = &ui->sample->user_regs;
> | ^~

Thanks, applied.

- Arnaldo


> Fixes: 9823147da6c8 ("perf tools: Move 'struct perf_sample' to a separate header file to disentangle headers")
> Signed-off-by: Eric Lin <[email protected]>
> ---
> tools/perf/arch/riscv/util/unwind-libdw.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/perf/arch/riscv/util/unwind-libdw.c b/tools/perf/arch/riscv/util/unwind-libdw.c
> index 19536e172850..54a198714eb8 100644
> --- a/tools/perf/arch/riscv/util/unwind-libdw.c
> +++ b/tools/perf/arch/riscv/util/unwind-libdw.c
> @@ -4,7 +4,7 @@
> #include <elfutils/libdwfl.h>
> #include "../../util/unwind-libdw.h"
> #include "../../util/perf_regs.h"
> -#include "../../util/event.h"
> +#include "../../util/sample.h"
>
> bool libdw__arch_set_initial_registers(Dwfl_Thread *thread, void *arg)
> {
> --
> 2.17.1

--

- Arnaldo