Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

tools: Copy uapi/asm/perf_regs.h from the kernel

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.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-sxf7rpow2blsno5f7t6n0sqz@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

+161 -2
+23
tools/arch/arm/include/uapi/asm/perf_regs.h
··· 1 + #ifndef _ASM_ARM_PERF_REGS_H 2 + #define _ASM_ARM_PERF_REGS_H 3 + 4 + enum perf_event_arm_regs { 5 + PERF_REG_ARM_R0, 6 + PERF_REG_ARM_R1, 7 + PERF_REG_ARM_R2, 8 + PERF_REG_ARM_R3, 9 + PERF_REG_ARM_R4, 10 + PERF_REG_ARM_R5, 11 + PERF_REG_ARM_R6, 12 + PERF_REG_ARM_R7, 13 + PERF_REG_ARM_R8, 14 + PERF_REG_ARM_R9, 15 + PERF_REG_ARM_R10, 16 + PERF_REG_ARM_FP, 17 + PERF_REG_ARM_IP, 18 + PERF_REG_ARM_SP, 19 + PERF_REG_ARM_LR, 20 + PERF_REG_ARM_PC, 21 + PERF_REG_ARM_MAX, 22 + }; 23 + #endif /* _ASM_ARM_PERF_REGS_H */
+40
tools/arch/arm64/include/uapi/asm/perf_regs.h
··· 1 + #ifndef _ASM_ARM64_PERF_REGS_H 2 + #define _ASM_ARM64_PERF_REGS_H 3 + 4 + enum perf_event_arm_regs { 5 + PERF_REG_ARM64_X0, 6 + PERF_REG_ARM64_X1, 7 + PERF_REG_ARM64_X2, 8 + PERF_REG_ARM64_X3, 9 + PERF_REG_ARM64_X4, 10 + PERF_REG_ARM64_X5, 11 + PERF_REG_ARM64_X6, 12 + PERF_REG_ARM64_X7, 13 + PERF_REG_ARM64_X8, 14 + PERF_REG_ARM64_X9, 15 + PERF_REG_ARM64_X10, 16 + PERF_REG_ARM64_X11, 17 + PERF_REG_ARM64_X12, 18 + PERF_REG_ARM64_X13, 19 + PERF_REG_ARM64_X14, 20 + PERF_REG_ARM64_X15, 21 + PERF_REG_ARM64_X16, 22 + PERF_REG_ARM64_X17, 23 + PERF_REG_ARM64_X18, 24 + PERF_REG_ARM64_X19, 25 + PERF_REG_ARM64_X20, 26 + PERF_REG_ARM64_X21, 27 + PERF_REG_ARM64_X22, 28 + PERF_REG_ARM64_X23, 29 + PERF_REG_ARM64_X24, 30 + PERF_REG_ARM64_X25, 31 + PERF_REG_ARM64_X26, 32 + PERF_REG_ARM64_X27, 33 + PERF_REG_ARM64_X28, 34 + PERF_REG_ARM64_X29, 35 + PERF_REG_ARM64_LR, 36 + PERF_REG_ARM64_SP, 37 + PERF_REG_ARM64_PC, 38 + PERF_REG_ARM64_MAX, 39 + }; 40 + #endif /* _ASM_ARM64_PERF_REGS_H */
+50
tools/arch/powerpc/include/uapi/asm/perf_regs.h
··· 1 + #ifndef _UAPI_ASM_POWERPC_PERF_REGS_H 2 + #define _UAPI_ASM_POWERPC_PERF_REGS_H 3 + 4 + enum perf_event_powerpc_regs { 5 + PERF_REG_POWERPC_R0, 6 + PERF_REG_POWERPC_R1, 7 + PERF_REG_POWERPC_R2, 8 + PERF_REG_POWERPC_R3, 9 + PERF_REG_POWERPC_R4, 10 + PERF_REG_POWERPC_R5, 11 + PERF_REG_POWERPC_R6, 12 + PERF_REG_POWERPC_R7, 13 + PERF_REG_POWERPC_R8, 14 + PERF_REG_POWERPC_R9, 15 + PERF_REG_POWERPC_R10, 16 + PERF_REG_POWERPC_R11, 17 + PERF_REG_POWERPC_R12, 18 + PERF_REG_POWERPC_R13, 19 + PERF_REG_POWERPC_R14, 20 + PERF_REG_POWERPC_R15, 21 + PERF_REG_POWERPC_R16, 22 + PERF_REG_POWERPC_R17, 23 + PERF_REG_POWERPC_R18, 24 + PERF_REG_POWERPC_R19, 25 + PERF_REG_POWERPC_R20, 26 + PERF_REG_POWERPC_R21, 27 + PERF_REG_POWERPC_R22, 28 + PERF_REG_POWERPC_R23, 29 + PERF_REG_POWERPC_R24, 30 + PERF_REG_POWERPC_R25, 31 + PERF_REG_POWERPC_R26, 32 + PERF_REG_POWERPC_R27, 33 + PERF_REG_POWERPC_R28, 34 + PERF_REG_POWERPC_R29, 35 + PERF_REG_POWERPC_R30, 36 + PERF_REG_POWERPC_R31, 37 + PERF_REG_POWERPC_NIP, 38 + PERF_REG_POWERPC_MSR, 39 + PERF_REG_POWERPC_ORIG_R3, 40 + PERF_REG_POWERPC_CTR, 41 + PERF_REG_POWERPC_LINK, 42 + PERF_REG_POWERPC_XER, 43 + PERF_REG_POWERPC_CCR, 44 + PERF_REG_POWERPC_SOFTE, 45 + PERF_REG_POWERPC_TRAP, 46 + PERF_REG_POWERPC_DAR, 47 + PERF_REG_POWERPC_DSISR, 48 + PERF_REG_POWERPC_MAX, 49 + }; 50 + #endif /* _UAPI_ASM_POWERPC_PERF_REGS_H */
+33
tools/arch/x86/include/uapi/asm/perf_regs.h
··· 1 + #ifndef _ASM_X86_PERF_REGS_H 2 + #define _ASM_X86_PERF_REGS_H 3 + 4 + enum perf_event_x86_regs { 5 + PERF_REG_X86_AX, 6 + PERF_REG_X86_BX, 7 + PERF_REG_X86_CX, 8 + PERF_REG_X86_DX, 9 + PERF_REG_X86_SI, 10 + PERF_REG_X86_DI, 11 + PERF_REG_X86_BP, 12 + PERF_REG_X86_SP, 13 + PERF_REG_X86_IP, 14 + PERF_REG_X86_FLAGS, 15 + PERF_REG_X86_CS, 16 + PERF_REG_X86_SS, 17 + PERF_REG_X86_DS, 18 + PERF_REG_X86_ES, 19 + PERF_REG_X86_FS, 20 + PERF_REG_X86_GS, 21 + PERF_REG_X86_R8, 22 + PERF_REG_X86_R9, 23 + PERF_REG_X86_R10, 24 + PERF_REG_X86_R11, 25 + PERF_REG_X86_R12, 26 + PERF_REG_X86_R13, 27 + PERF_REG_X86_R14, 28 + PERF_REG_X86_R15, 29 + 30 + PERF_REG_X86_32_MAX = PERF_REG_X86_GS + 1, 31 + PERF_REG_X86_64_MAX = PERF_REG_X86_R15 + 1, 32 + }; 33 + #endif /* _ASM_X86_PERF_REGS_H */
+1 -1
tools/perf/MANIFEST
··· 80 80 include/linux/swab.h 81 81 arch/*/include/asm/unistd*.h 82 82 arch/*/include/uapi/asm/unistd*.h 83 - arch/*/include/uapi/asm/perf_regs.h 83 + tools/arch/*/include/uapi/asm/perf_regs.h 84 84 include/linux/poison.h 85 85 include/linux/hw_breakpoint.h 86 86 include/uapi/linux/const.h
+12
tools/perf/Makefile.perf
··· 363 363 @(test -f ../../arch/x86/lib/memset_64.S && ( \ 364 364 (diff -B ../arch/x86/lib/memset_64.S ../../arch/x86/lib/memset_64.S >/dev/null) \ 365 365 || echo "Warning: tools/arch/x86/lib/memset_64.S differs from kernel" >&2 )) || true 366 + @(test -f ../../arch/arm/include/uapi/asm/perf_regs.h && ( \ 367 + (diff -B ../arch/arm/include/uapi/asm/perf_regs.h ../../arch/arm/include/uapi/asm/perf_regs.h >/dev/null) \ 368 + || echo "Warning: tools/arch/arm/include/uapi/asm/perf_regs.h differs from kernel" >&2 )) || true 369 + @(test -f ../../arch/arm64/include/uapi/asm/perf_regs.h && ( \ 370 + (diff -B ../arch/arm64/include/uapi/asm/perf_regs.h ../../arch/arm64/include/uapi/asm/perf_regs.h >/dev/null) \ 371 + || echo "Warning: tools/arch/arm64/include/uapi/asm/perf_regs.h differs from kernel" >&2 )) || true 372 + @(test -f ../../arch/powerpc/include/uapi/asm/perf_regs.h && ( \ 373 + (diff -B ../arch/powerpc/include/uapi/asm/perf_regs.h ../../arch/powerpc/include/uapi/asm/perf_regs.h >/dev/null) \ 374 + || echo "Warning: tools/arch/powerpc/include/uapi/asm/perf_regs.h differs from kernel" >&2 )) || true 375 + @(test -f ../../arch/x86/include/uapi/asm/perf_regs.h && ( \ 376 + (diff -B ../arch/x86/include/uapi/asm/perf_regs.h ../../arch/x86/include/uapi/asm/perf_regs.h >/dev/null) \ 377 + || echo "Warning: tools/arch/x86/include/uapi/asm/perf_regs.h differs from kernel" >&2 )) || true 366 378 $(Q)$(MAKE) $(build)=perf 367 379 368 380 $(OUTPUT)perf: $(PERFLIBS) $(PERF_IN) $(LIBTRACEEVENT_DYNAMIC_LIST)
+2 -1
tools/perf/config/Makefile
··· 208 208 CFLAGS += -I$(src-perf)/arch/$(ARCH)/include 209 209 CFLAGS += -I$(srctree)/tools/include/uapi 210 210 CFLAGS += -I$(srctree)/tools/include/ 211 + CFLAGS += -I$(srctree)/tools/arch/$(ARCH)/include/uapi 212 + CFLAGS += -I$(srctree)/tools/arch/$(ARCH)/include/ 211 213 CFLAGS += -I$(srctree)/arch/$(ARCH)/include/uapi 212 214 CFLAGS += -I$(srctree)/arch/$(ARCH)/include 213 - CFLAGS += -I$(srctree)/tools/arch/$(ARCH)/include/uapi 214 215 CFLAGS += -I$(srctree)/tools/arch/$(ARCH)/ 215 216 CFLAGS += -I$(srctree)/include/uapi 216 217 CFLAGS += -I$(srctree)/include