instrumentation: module: remove compatibility code

[lttng-modules.git] / instrumentation / events / lttng-module / module.h

diff --git a/instrumentation/events/lttng-module/module.h b/instrumentation/events/lttng-module/module.h
index 89b1e7980d7d0a928d4753303d26eb6381328003..5299e17f54e55f87e99e1181cefd6dea057c1707 100644 (file)
--- a/instrumentation/events/lttng-module/module.h
+++ b/instrumentation/events/lttng-module/module.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Because linux/module.h has tracepoints in the header, and ftrace.h
  * eventually includes this file, define_trace.h includes linux/module.h
@@ -16,7 +16,6 @@
 #define LTTNG_TRACE_MODULE_H
 
 #include <probes/lttng-tracepoint-event.h>
-#include <linux/version.h>
 
 #ifdef CONFIG_MODULES
 
@@ -59,12 +58,8 @@ LTTNG_TRACEPOINT_EVENT_CLASS(module_refcnt,
        TP_ARGS(mod, ip),
 
        TP_FIELDS(
-               ctf_integer(unsigned long, ip, ip)
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0))
+               ctf_integer_hex(unsigned long, ip, ip)
                ctf_integer(int, refcnt, atomic_read(&mod->refcnt))
-#else
-               ctf_integer(int, refcnt, __this_cpu_read(mod->refptr->incs) + __this_cpu_read(mod->refptr->decs))
-#endif
                ctf_string(name, mod->name)
        )
 )
@@ -91,7 +86,7 @@ LTTNG_TRACEPOINT_EVENT(module_request,
        TP_ARGS(name, wait, ip),
 
        TP_FIELDS(
-               ctf_integer(unsigned long, ip, ip)
+               ctf_integer_hex(unsigned long, ip, ip)
                ctf_integer(bool, wait, wait)
                ctf_string(name, name)
        )