Cleanup: Remove deprecated TODO file

[lttng-modules.git] / instrumentation / events / lttng-module / mm_vmscan.h

diff --git a/instrumentation/events/lttng-module/mm_vmscan.h b/instrumentation/events/lttng-module/mm_vmscan.h
index 417472c774b1b7ef9acbeef197fb3998aa5da6e6..8bdd65d2a7a13e2b77a9377ec8e98c3206fc7b8d 100644 (file)
--- a/instrumentation/events/lttng-module/mm_vmscan.h
+++ b/instrumentation/events/lttng-module/mm_vmscan.h
@@ -1,11 +1,11 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM mm_vmscan
 
 #if !defined(LTTNG_TRACE_MM_VMSCAN_H) || defined(TRACE_HEADER_MULTI_READ)
 #define LTTNG_TRACE_MM_VMSCAN_H
 
-#include <probes/lttng-tracepoint-event.h>
+#include <lttng/tracepoint-event.h>
 #include <linux/types.h>
 #include <linux/mm.h>
 #include <linux/memcontrol.h>
@@ -568,7 +568,20 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_vmscan_lru_isolate_template, mm_vmscan_memcg_
 )
 #endif
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,2,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,7,0))
+LTTNG_TRACEPOINT_EVENT(mm_vmscan_writepage,
+
+       TP_PROTO(struct page *page),
+
+       TP_ARGS(page),
+
+       TP_FIELDS(
+               ctf_integer_hex(struct page *, page, page)
+               ctf_integer(int, reclaim_flags, trace_reclaim_flags(
+                               page_is_file_lru(page)))
+       )
+)
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5,2,0))
 LTTNG_TRACEPOINT_EVENT(mm_vmscan_writepage,
 
        TP_PROTO(struct page *page),
@@ -625,7 +638,8 @@ LTTNG_TRACEPOINT_EVENT(mm_vmscan_lru_shrink_inactive,
                ctf_integer(unsigned long, nr_writeback, stat->nr_writeback)
                ctf_integer(unsigned long, nr_congested, stat->nr_congested)
                ctf_integer(unsigned long, nr_immediate, stat->nr_immediate)
-               ctf_integer(unsigned long, nr_activate, stat->nr_activate)
+               ctf_integer(unsigned long, nr_activate_anon, stat->nr_activate[0])
+               ctf_integer(unsigned long, nr_activate_file, stat->nr_activate[1])
                ctf_integer(unsigned long, nr_ref_keep, stat->nr_ref_keep)
                ctf_integer(unsigned long, nr_unmap_fail, stat->nr_unmap_fail)
                ctf_integer(int, priority, priority)
@@ -808,4 +822,4 @@ LTTNG_TRACEPOINT_EVENT_MAP(update_swap_token_priority,
 #endif /* LTTNG_TRACE_MM_VMSCAN_H */
 
 /* This part must be outside protection */
-#include <probes/define_trace.h>
+#include <lttng/define_trace.h>