tools x86 uapi asm: Sync the pt_regs.h copy with the kernel sources
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: 0ceb5499a8001e5ddac2c8bd7b45eb4c643469ad Gitweb: https://git.kernel.org/tip/0ceb5499a8001e5ddac2c8bd7b45eb4c643469ad Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Mon, 13 May 2019 13:35:38 -0400 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 15 May 2019 16:36:46 -0300
tools x86 uapi asm: Sync the pt_regs.h copy with the kernel sources
To get the changes in:
878068ea270e ("perf/x86: Support outputting XMM registers")
That will be used in a followup patch to allow users to ask for some or all of those registers to be collected in certain contatexts.
This silences the following perf build warning:
Warning: Kernel ABI header at 'tools/arch/x86/include/uapi/asm/perf_regs.h' differs from latest version at 'arch/x86/include/uapi/asm/perf_regs.h' diff -u tools/arch/x86/include/uapi/asm/perf_regs.h arch/x86/include/uapi/asm/perf_regs.h
Cc Adrian Hunter <[email protected]>
Cc Alexander Shishkin <[email protected]>
Cc Andi Kleen <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Kan Liang <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Peter Zijlstra <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/arch/x86/include/uapi/asm/perf_regs.h | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-)
tools/arch/x86/include/uapi/asm/perf_regs.h +22 -1
@@ -27,8 +27,29 @@ enum perf_event_x86_regs {PERF_REG_X86_R13 ,PERF_REG_X86_R14 ,PERF_REG_X86_R15 , - +/* These are the limits for the GPRs. */ PERF_REG_X86_32_MAX =PERF_REG_X86_GS +1 ,PERF_REG_X86_64_MAX =PERF_REG_X86_R15 +1 , + +/* These all need two bits set because they are 128bit */ +PERF_REG_X86_XMM0 =32 , +PERF_REG_X86_XMM1 =34 , +PERF_REG_X86_XMM2 =36 , +PERF_REG_X86_XMM3 =38 , +PERF_REG_X86_XMM4 =40 , +PERF_REG_X86_XMM5 =42 , +PERF_REG_X86_XMM6 =44 , +PERF_REG_X86_XMM7 =46 , +PERF_REG_X86_XMM8 =48 , +PERF_REG_X86_XMM9 =50 , +PERF_REG_X86_XMM10 =52 , +PERF_REG_X86_XMM11 =54 , +PERF_REG_X86_XMM12 =56 , +PERF_REG_X86_XMM13 =58 , +PERF_REG_X86_XMM14 =60 , +PERF_REG_X86_XMM15 =62 , + +/* These include both GPRs and XMMX registers */ + PERF_REG_X86_XMM_MAX = PERF_REG_X86_XMM15 + 2, };#endif /* _ASM_X86_PERF_REGS_H */