Em Mon, Nov 30, 2020 at 09:27:52AM -0800, [email protected] escreveu: > From: Kan Liang <[email protected]> > > To get the changes in: > > commit 8d97e71811aa ("perf/core: Add PERF_SAMPLE_DATA_PAGE_SIZE") > commit 995f088efebe ("perf/core: Add support for > PERF_SAMPLE_CODE_PAGE_SIZE") > > This silences this perf tools build warning:
Thanks, this is in tip/perf/core, so I'm applying it to my perf/core branch. - Arnaldo > 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 > > Acked-by: Namhyung Kim <[email protected]> > Signed-off-by: Kan Liang <[email protected]> > --- > tools/include/uapi/linux/perf_event.h | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/tools/include/uapi/linux/perf_event.h > b/tools/include/uapi/linux/perf_event.h > index b95d3c485d27..b15e3447cd9f 100644 > --- a/tools/include/uapi/linux/perf_event.h > +++ b/tools/include/uapi/linux/perf_event.h > @@ -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, > -- > 2.17.1 > -- - Arnaldo
