Fix: Build on CentOS 9 Stream 2024-06

Change-Id: I445d2df9d49930e28e57b6a7d075a9f68e914bad
Signed-off-by: Kienan Stewart <kstewart@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/include/instrumentation/events/lttng-statedump.h b/include/instrumentation/events/lttng-statedump.h
index 228b106f55a2b37521c1a2eaadb9829f5008398e..05b3bd7666a057e3894ef8d658941f0a1805a555 100644 (file)
--- a/include/instrumentation/events/lttng-statedump.h
+++ b/include/instrumentation/events/lttng-statedump.h
@@ -266,7 +266,8 @@ LTTNG_TRACEPOINT_EVENT(lttng_statedump_interrupt,
 
 #define LTTNG_HAVE_STATEDUMP_CPU_TOPOLOGY
 
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,7,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,7,0) || \
+       LTTNG_RHEL_KERNEL_RANGE(5,14,0,452,0,0, 5,15,0,0,0,0))
 LTTNG_TRACEPOINT_EVENT(lttng_statedump_cpu_topology,
        TP_PROTO(struct lttng_kernel_session *session, struct cpuinfo_x86 *c),
        TP_ARGS(session, c),

diff --git a/include/instrumentation/events/sched.h b/include/instrumentation/events/sched.h
index 24cf37c80d49b2e100cbb38d5cfd3ae1ce937bca..32d1813371f9093aa2b2b68a1c8cf36fd7abb5b8 100644 (file)
--- a/include/instrumentation/events/sched.h
+++ b/include/instrumentation/events/sched.h
@@ -646,7 +646,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_stat_template, sched_stat_blocked,
             TP_ARGS(tsk, delay))
 #endif
 
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,8,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,8,0) || \
+       LTTNG_RHEL_KERNEL_RANGE(5,14,0,452,0,0, 5,15,0,0,0,0))
 /*
  * Tracepoint for accounting runtime (time the task is executing
  * on a CPU).

diff --git a/include/instrumentation/events/timer.h b/include/instrumentation/events/timer.h
index 77c4111a96903229c98f34fea0b505d4802a9150..9cce7d241dfce5d3948efb7afb78f83ef887fc5c 100644 (file)
--- a/include/instrumentation/events/timer.h
+++ b/include/instrumentation/events/timer.h
@@ -45,7 +45,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(timer_class, timer_init,
        TP_ARGS(timer)
 )
 
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,8,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,8,0) || \
+       LTTNG_RHEL_KERNEL_RANGE(5,14,0,457,0,0, 5,15,0,0,0,0))
 /**
  * timer_start - called when the timer is started
  * @timer:     pointer to struct timer_list

diff --git a/include/wrapper/mm.h b/include/wrapper/mm.h
index 61ac812749b734670beabbe3229633e790a29e69..060b6f929f56b95bcbeae122c2ebef8659fa29f7 100644 (file)
--- a/include/wrapper/mm.h
+++ b/include/wrapper/mm.h
@@ -13,7 +13,8 @@
 
 #include <lttng/kernel-version.h>
 
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,3,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,3,0) || \
+       LTTNG_RHEL_KERNEL_RANGE(5,14,0,452,0,0, 5,15,0,0,0,0))
 static inline
 void wrapper_vm_flags_set(struct vm_area_struct *vma,
                vm_flags_t flags)