From: Kienan Stewart Date: Thu, 21 Mar 2024 19:16:29 +0000 (-0400) Subject: Fix: correct RHEL range for kmem_cache_free define X-Git-Tag: v2.12.17~5 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=67053c585d7407d38959833468c5d2bb2b347b54;p=lttng-modules.git Fix: correct RHEL range for kmem_cache_free define When compiling against RHEL 8.5 kernels, lttng-modules builds fail with the following error: ``` lttng-modules/src/probes/../../include/lttng/tracepoint-event-impl.h:133:6: error: conflicting types for ‘trace_kmem_ cache_free’; have ‘void(long unsigned int, const void *)’ ``` The original range was introduced in commit 89d917153fc52c1e5b0ddabf8ee078897656b263 which tested against RHEL 8.6 and not RHEL 8.5. Change-Id: Icff98c15415ce8e1e95a10974cd65ed6e84cd00a Signed-off-by: Kienan Stewart Signed-off-by: Mathieu Desnoyers --- diff --git a/instrumentation/events/lttng-module/kmem.h b/instrumentation/events/lttng-module/kmem.h index 5a2bfdb6..c5a956e2 100644 --- a/instrumentation/events/lttng-module/kmem.h +++ b/instrumentation/events/lttng-module/kmem.h @@ -88,7 +88,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(kmem_alloc_node, kmem_cache_alloc_node, ) #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,12,0) || \ - LTTNG_RHEL_KERNEL_RANGE(4,18,0,372,0,0, 4,19,0,0,0,0)) + LTTNG_RHEL_KERNEL_RANGE(4,18,0,348,0,0, 4,19,0,0,0,0)) LTTNG_TRACEPOINT_EVENT_MAP(kfree, kmem_kfree,