Commit 47d98220 authored by Kan Liang's avatar Kan Liang Committed by Arnaldo Carvalho de Melo
Browse files

tools headers UAPI: Update tools's copy of linux/perf_event.h 



To get the changes in:

   commit 8d97e718 ("perf/core: Add PERF_SAMPLE_DATA_PAGE_SIZE")
   commit 995f088e ("perf/core: Add support for PERF_SAMPLE_CODE_PAGE_SIZE")

This silences this perf tools build warning:

  Warning: Kernel ABI header at 'tools/include/uapi/linux/perf_event.h'
differs from latest version at 'include/uapi/linux/perf_event.h'
  diff -u tools/include/uapi/linux/perf_event.h
include/uapi/linux/perf_event.h

Signed-off-by: default avatarKan Liang <kan.liang@linux.intel.com>
Acked-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Stephane Eranian <eranian@google.com>
Cc: Will Deacon <will@kernel.org>
Link: http://lore.kernel.org/lkml/20201130172803.2676-2-kan.liang@linux.intel.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent bf53fc6b

tools/include/uapi/linux/perf_event.h

+5 −1
Original line number Diff line number Diff line
@@ -143,8 +143,10 @@ enum perf_event_sample_format { 
	PERF_SAMPLE_PHYS_ADDR			= 1U << 19,

	PERF_SAMPLE_AUX				= 1U << 20,

	PERF_SAMPLE_CGROUP			= 1U << 21,

	PERF_SAMPLE_DATA_PAGE_SIZE		= 1U << 22,

	PERF_SAMPLE_CODE_PAGE_SIZE		= 1U << 23,



	PERF_SAMPLE_MAX = 1U << 22,		/* non-ABI */

	PERF_SAMPLE_MAX = 1U << 24,		/* non-ABI */



	__PERF_SAMPLE_CALLCHAIN_EARLY		= 1ULL << 63, /* non-ABI; internal use */

};
@@ -896,6 +898,8 @@ enum perf_event_type { 
	 *	{ u64			phys_addr;} && PERF_SAMPLE_PHYS_ADDR

	 *	{ u64			size;

	 *	  char			data[size]; } && PERF_SAMPLE_AUX

	 *	{ u64			data_page_size;} && PERF_SAMPLE_DATA_PAGE_SIZE

	 *	{ u64			code_page_size;} && PERF_SAMPLE_CODE_PAGE_SIZE

	 * };

	 */

	PERF_RECORD_SAMPLE			= 9,