Merged into master, 2.10, 2.9, thanks! Mathieu
----- On Nov 28, 2017, at 10:02 PM, Michael Jeanson mjean...@efficios.com wrote: > See upstream commit: > > commit 2d4894b5d2ae0fe1725ea7abd57b33bfbbe45492 > Author: Mel Gorman <mgor...@techsingularity.net> > Date: Wed Nov 15 17:37:59 2017 -0800 > > mm: remove cold parameter from free_hot_cold_page* > > Signed-off-by: Michael Jeanson <mjean...@efficios.com> > --- > instrumentation/events/lttng-module/kmem.h | 27 +++++++++++++++++++++++++-- > 1 file changed, 25 insertions(+), 2 deletions(-) > > diff --git a/instrumentation/events/lttng-module/kmem.h > b/instrumentation/events/lttng-module/kmem.h > index ad7bf77..c3fa25a 100644 > --- a/instrumentation/events/lttng-module/kmem.h > +++ b/instrumentation/events/lttng-module/kmem.h > @@ -132,11 +132,33 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_page_free_direct, > kmem_mm_page_free_direct, > ) > ) > > -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)) > +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0)) > +LTTNG_TRACEPOINT_EVENT_MAP(mm_page_free_batched, kmem_mm_page_free_batched, > + > + TP_PROTO(struct page *page), > + > + TP_ARGS(page), > + > + TP_FIELDS( > + ctf_integer_hex(struct page *, page, page) > + ctf_integer(unsigned long, pfn, page_to_pfn(page)) > + ) > +) > +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)) > LTTNG_TRACEPOINT_EVENT_MAP(mm_page_free_batched, kmem_mm_page_free_batched, > + > + TP_PROTO(struct page *page, int cold), > + > + TP_ARGS(page, cold), > + > + TP_FIELDS( > + ctf_integer_hex(struct page *, page, page) > + ctf_integer(unsigned long, pfn, page_to_pfn(page)) > + ctf_integer(int, cold, cold) > + ) > +) > #else > LTTNG_TRACEPOINT_EVENT_MAP(mm_pagevec_free, kmem_pagevec_free, > -#endif > > TP_PROTO(struct page *page, int cold), > > @@ -148,6 +170,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_pagevec_free, > kmem_pagevec_free, > ctf_integer(int, cold, cold) > ) > ) > +#endif > > LTTNG_TRACEPOINT_EVENT_MAP(mm_page_alloc, kmem_mm_page_alloc, > > -- > 2.7.4 -- Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list lttng-dev@lists.lttng.org https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
