Messages in this thread | | | Date | Tue, 1 Jun 2021 10:08:37 -0300 | From | Arnaldo Carvalho de Melo <> | Subject | Re: [PATCH] perf tools: Copy uapi/asm/perf_regs.h from the kernel for MIPS |
| |
Em Tue, Jun 01, 2021 at 07:53:56PM +0800, Tiezhu Yang escreveu: > To allow the build to complete on older systems, where those files are > either not uptodate, lacking some recent additions or not present at > all. > > And check if the copy drifts from the kernel. > > This commit is similar with > commit 12f020338a2c ("tools: Copy uapi/asm/perf_regs.h from the kernel") > > With this commit, we can avoid the following build error in any case: > > tools/perf/arch/mips/include/perf_regs.h:7:10: > fatal error: asm/perf_regs.h: No such file or directory > #include <asm/perf_regs.h> > ^~~~~~~~~~~~~~~~~ > compilation terminated.
Thanks, applied.
- Arnaldo
> Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn> > --- > tools/arch/mips/include/uapi/asm/perf_regs.h | 40 ++++++++++++++++++++++++++++ > tools/perf/Makefile.config | 1 - > tools/perf/check-headers.sh | 1 + > 3 files changed, 41 insertions(+), 1 deletion(-) > create mode 100644 tools/arch/mips/include/uapi/asm/perf_regs.h > > diff --git a/tools/arch/mips/include/uapi/asm/perf_regs.h b/tools/arch/mips/include/uapi/asm/perf_regs.h > new file mode 100644 > index 0000000..d0f4ecd > --- /dev/null > +++ b/tools/arch/mips/include/uapi/asm/perf_regs.h > @@ -0,0 +1,40 @@ > +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ > +#ifndef _ASM_MIPS_PERF_REGS_H > +#define _ASM_MIPS_PERF_REGS_H > + > +enum perf_event_mips_regs { > + PERF_REG_MIPS_PC, > + PERF_REG_MIPS_R1, > + PERF_REG_MIPS_R2, > + PERF_REG_MIPS_R3, > + PERF_REG_MIPS_R4, > + PERF_REG_MIPS_R5, > + PERF_REG_MIPS_R6, > + PERF_REG_MIPS_R7, > + PERF_REG_MIPS_R8, > + PERF_REG_MIPS_R9, > + PERF_REG_MIPS_R10, > + PERF_REG_MIPS_R11, > + PERF_REG_MIPS_R12, > + PERF_REG_MIPS_R13, > + PERF_REG_MIPS_R14, > + PERF_REG_MIPS_R15, > + PERF_REG_MIPS_R16, > + PERF_REG_MIPS_R17, > + PERF_REG_MIPS_R18, > + PERF_REG_MIPS_R19, > + PERF_REG_MIPS_R20, > + PERF_REG_MIPS_R21, > + PERF_REG_MIPS_R22, > + PERF_REG_MIPS_R23, > + PERF_REG_MIPS_R24, > + PERF_REG_MIPS_R25, > + PERF_REG_MIPS_R26, > + PERF_REG_MIPS_R27, > + PERF_REG_MIPS_R28, > + PERF_REG_MIPS_R29, > + PERF_REG_MIPS_R30, > + PERF_REG_MIPS_R31, > + PERF_REG_MIPS_MAX = PERF_REG_MIPS_R31 + 1, > +}; > +#endif /* _ASM_MIPS_PERF_REGS_H */ > diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config > index 406a951..73df23d 100644 > --- a/tools/perf/Makefile.config > +++ b/tools/perf/Makefile.config > @@ -90,7 +90,6 @@ endif > ifeq ($(ARCH),mips) > NO_PERF_REGS := 0 > CFLAGS += -I$(OUTPUT)arch/mips/include/generated > - CFLAGS += -I../../arch/mips/include/uapi -I../../arch/mips/include/generated/uapi > LIBUNWIND_LIBS = -lunwind -lunwind-mips > endif > > diff --git a/tools/perf/check-headers.sh b/tools/perf/check-headers.sh > index dd8ff28..c783558 100755 > --- a/tools/perf/check-headers.sh > +++ b/tools/perf/check-headers.sh > @@ -39,6 +39,7 @@ arch/x86/lib/x86-opcode-map.txt > arch/x86/tools/gen-insn-attr-x86.awk > arch/arm/include/uapi/asm/perf_regs.h > arch/arm64/include/uapi/asm/perf_regs.h > +arch/mips/include/uapi/asm/perf_regs.h > arch/powerpc/include/uapi/asm/perf_regs.h > arch/s390/include/uapi/asm/perf_regs.h > arch/x86/include/uapi/asm/perf_regs.h > -- > 2.1.0 >
--
- Arnaldo
| |