lttng-modules fix for RHEL 9.5 kernels

This fixes the asoc_snd_*, kfree_skb and udp related tracepoints for the
RHEL 9.5 distro kernel.

In all cases they've updated to the format of newer kernels.

Signed-off-by: Martin Hicks <martin@sr-research.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/include/instrumentation/events/asoc.h b/include/instrumentation/events/asoc.h
index 38d188786bdbbe5739d3294fa777c7230240b0fb..c38e9e94a145ccb42626d882c3f35f13ed7be722 100644 (file)
--- a/include/instrumentation/events/asoc.h
+++ b/include/instrumentation/events/asoc.h
@@ -23,7 +23,9 @@ struct snd_soc_dapm_widget;
 struct snd_soc_dapm_path;
 #endif
 
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,9,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,9,0) || \
+    LTTNG_RHEL_KERNEL_RANGE(5,14,0,503,21,1,  5,15,0,0,0,0))
+
 LTTNG_TRACEPOINT_EVENT_CLASS(asoc_snd_soc_dapm_context,
 
        TP_PROTO(struct snd_soc_dapm_context *dapm, int val),
@@ -90,7 +92,9 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_card, snd_soc_bias_level_done,
 )
 #endif
 
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,9,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,9,0) || \
+    LTTNG_RHEL_KERNEL_RANGE(5,14,0,503,21,1,  5,15,0,0,0,0))
+
 LTTNG_TRACEPOINT_EVENT_CLASS(asoc_snd_soc_dapm_basic,
 
        TP_PROTO(struct snd_soc_card *card, int event),

diff --git a/include/instrumentation/events/skb.h b/include/instrumentation/events/skb.h
index 0b5a95dce8af77df1f4d6d399d509d7f244ab57e..dd62e177f508b1807b653038fb8e5a752be4ddc9 100644 (file)
--- a/include/instrumentation/events/skb.h
+++ b/include/instrumentation/events/skb.h
@@ -43,7 +43,9 @@ LTTNG_TRACEPOINT_ENUM(skb_drop_reason,
 )
 #endif
 
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,11,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,11,0) || \
+    LTTNG_RHEL_KERNEL_RANGE(5,14,0,503,21,1,  5,15,0,0,0,0))
+
 LTTNG_TRACEPOINT_EVENT_MAP(kfree_skb,
 
        skb_kfree,

diff --git a/include/instrumentation/events/udp.h b/include/instrumentation/events/udp.h
index f79d0b0353e92e84f7550c322e556e9528390644..6dc1cb19123168498c78f899946d8c208fe0d3d9 100644 (file)
--- a/include/instrumentation/events/udp.h
+++ b/include/instrumentation/events/udp.h
@@ -12,7 +12,9 @@
 #include <linux/udp.h>
 #include <lttng/kernel-version.h>
 
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,10,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,10,0) || \
+    LTTNG_RHEL_KERNEL_RANGE(5,14,0,503,21,1,  5,15,0,0,0,0))
+
 LTTNG_TRACEPOINT_ENUM(lttng_sk_family,
        TP_ENUM_VALUES(
                ctf_enum_value("AF_INET", AF_INET)