From 03edc768329329821d87ff336923977ec3972d7f Mon Sep 17 00:00:00 2001 From: Kienan Stewart Date: Thu, 21 Mar 2024 15:16:29 -0400 Subject: [PATCH] Fix: correct RHEL range for kmem_cache_free define MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 --- include/instrumentation/events/kmem.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/instrumentation/events/kmem.h b/include/instrumentation/events/kmem.h index f2e2d11d..0d6a8769 100644 --- a/include/instrumentation/events/kmem.h +++ b/include/instrumentation/events/kmem.h @@ -234,7 +234,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(kmem_alloc_node, kmem_cache_alloc_node, #endif #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, -- 2.34.1