From: Michael Jeanson <mjeanson@efficios.com>

Date: Mon Apr 4 15:14:01 2022 -0400

Git-commit: 4bc54914836f765470e487f832398072a6f1372b

Signed-off-by: Tony Jones <tonyj@suse.de>

​

    fix: mm: compaction: cleanup the compaction trace events (v5.18)

​

    SUSE: Adjust this commit to reflect SLE15-SP5 backport

    Original lttng patch for v5.17 is afc4fe8905620a3eb14a5ed16146dac1db0f8111

​

--- a/include/instrumentation/events/compaction.h

+++ b/include/instrumentation/events/compaction.h

@@ -112,7 +112,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_compaction

        ctf_integer(unsigned long, nr_failed, cc->nr_migratepages - nr_succeeded)

    )

 )

-#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0))

+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0) || defined(CONFIG_SUSE_KERNEL))

 LTTNG_TRACEPOINT_EVENT_MAP(mm_compaction_migratepages,

    compaction_migratepages,

​