Update README.md for supported kernel

[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 3bb75594b1084871463dc2b6b64afba64eb595b0..5299e17f54e55f87e99e1181cefd6dea057c1707 100644 (file)
--- a/instrumentation/events/lttng-module/module.h
+++ b/instrumentation/events/lttng-module/module.h
@@ -1,3 +1,4 @@
+/* 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
@@ -14,8 +15,7 @@
 #if !defined(LTTNG_TRACE_MODULE_H) || defined(TRACE_HEADER_MULTI_READ)
 #define LTTNG_TRACE_MODULE_H
 
-#include "../../../probes/lttng-tracepoint-event.h"
-#include <linux/version.h>
+#include <probes/lttng-tracepoint-event.h>
 
 #ifdef CONFIG_MODULES
 
@@ -53,53 +53,29 @@ LTTNG_TRACEPOINT_EVENT(module_free,
 
 LTTNG_TRACEPOINT_EVENT_CLASS(module_refcnt,
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
        TP_PROTO(struct module *mod, unsigned long ip),
 
        TP_ARGS(mod, ip),
-#else
-       TP_PROTO(struct module *mod, unsigned long ip, int refcnt),
-
-       TP_ARGS(mod, ip, refcnt),
-#endif
 
        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))
-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
-               ctf_integer(int, refcnt, __this_cpu_read(mod->refptr->incs) + __this_cpu_read(mod->refptr->decs))
-#else
-               ctf_integer(int, refcnt, refcnt)
-#endif
                ctf_string(name, mod->name)
        )
 )
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE(module_refcnt, module_get,
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
        TP_PROTO(struct module *mod, unsigned long ip),
 
        TP_ARGS(mod, ip)
-#else
-       TP_PROTO(struct module *mod, unsigned long ip, int refcnt),
-
-       TP_ARGS(mod, ip, refcnt)
-#endif
 )
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE(module_refcnt, module_put,
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
        TP_PROTO(struct module *mod, unsigned long ip),
 
        TP_ARGS(mod, ip)
-#else
-       TP_PROTO(struct module *mod, unsigned long ip, int refcnt),
-
-       TP_ARGS(mod, ip, refcnt)
-#endif
 )
 #endif /* CONFIG_MODULE_UNLOAD */
 
@@ -110,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)
        )
@@ -121,4 +97,4 @@ LTTNG_TRACEPOINT_EVENT(module_request,
 #endif /* LTTNG_TRACE_MODULE_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>