From: Kienan Stewart Date: Mon, 16 Oct 2023 14:10:09 +0000 (-0400) Subject: Fix build for RHEL 8.8 with linux 4.18.0-477.10.1+ X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=f00168b56ad642e0369c03b8cd730be85dc46188;p=lttng-modules.git Fix build for RHEL 8.8 with linux 4.18.0-477.10.1+ 4.18.0-477.10.1 introduces backports a change which updates the `kfree_skb` trace event to the 3-argument version used in more recent kernel versions. Change-Id: I5a1071a59659b76e1499beae3388159ca8ced1f7 Signed-off-by: Kienan Stewart Signed-off-by: Mathieu Desnoyers --- diff --git a/include/instrumentation/events/skb.h b/include/instrumentation/events/skb.h index 039debc6..08704b98 100644 --- a/include/instrumentation/events/skb.h +++ b/include/instrumentation/events/skb.h @@ -14,7 +14,8 @@ * Tracepoint for free an sk_buff: */ #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0) \ - || LTTNG_KERNEL_RANGE(5,15,58, 5,16,0)) + || LTTNG_KERNEL_RANGE(5,15,58, 5,16,0) \ + || LTTNG_RHEL_KERNEL_RANGE(4,18,0,477,10,1, 4,19,0,0,0,0)) LTTNG_TRACEPOINT_ENUM(skb_drop_reason, TP_ENUM_VALUES( ctf_enum_value("NOT_SPECIFIED", SKB_DROP_REASON_NOT_SPECIFIED) @@ -41,7 +42,8 @@ LTTNG_TRACEPOINT_ENUM(skb_drop_reason, #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0) \ || LTTNG_KERNEL_RANGE(5,15,58, 5,16,0) \ - || LTTNG_RHEL_KERNEL_RANGE(5,14,0,70,0,0, 5,15,0,0,0,0)) + || LTTNG_RHEL_KERNEL_RANGE(5,14,0,70,0,0, 5,15,0,0,0,0) \ + || LTTNG_RHEL_KERNEL_RANGE(4,18,0,477,10,1, 4,19,0,0,0,0)) LTTNG_TRACEPOINT_EVENT_MAP(kfree_skb, skb_kfree,