Commit 0ceb5499 authored May 13, 2019 by Arnaldo Carvalho de Melo

tools x86 uapi asm: Sync the pt_regs.h copy with the kernel sources

To get the changes in:

  878068ea ("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 <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lkml.kernel.org/n/tip-6pjnnrzqt3x3n2cd6br3wk7k@git.kernel.org


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent f98f10f3

tools/arch/x86/include/uapi/asm/perf_regs.h

+22 −1

Original line number	Diff line number	Diff line
		@@ -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 */

Admin message