X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fmodule.h;h=c2d1ad772fb898e6090714eb1a47f692eaedf5ac;hb=fc6d6f213148c9babf46500058b10ff99db7d4d0;hp=65a8135e26917f670d4655cef8808a40c95ac302;hpb=d3ac4d63d21c643df5b09d9d7888eb0c4122379c;p=lttng-modules.git

diff --git a/instrumentation/events/lttng-module/module.h b/instrumentation/events/lttng-module/module.h
index 65a8135e..c2d1ad77 100644
--- a/instrumentation/events/lttng-module/module.h
+++ b/instrumentation/events/lttng-module/module.h
@@ -15,6 +15,7 @@
 #define _TRACE_MODULE_H
 
 #include <linux/tracepoint.h>
+#include <linux/version.h>
 
 #ifdef CONFIG_MODULES
 
@@ -22,10 +23,6 @@
 #define _TRACE_MODULE_DEF
 struct module;
 
-#define show_module_flags(flags) __print_flags(flags, "",	\
-	{ (1UL << TAINT_PROPRIETARY_MODULE),	"P" },		\
-	{ (1UL << TAINT_FORCED_MODULE),		"F" },		\
-	{ (1UL << TAINT_CRAP),			"C" })
 #endif
 
 TRACE_EVENT(module_load,
@@ -69,9 +66,15 @@ TRACE_EVENT(module_free,
 
 DECLARE_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_STRUCT__entry(
 		__field(	unsigned long,	ip		)
@@ -81,7 +84,11 @@ DECLARE_EVENT_CLASS(module_refcnt,
 
 	TP_fast_assign(
 		tp_assign(ip, ip)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
 		tp_assign(refcnt, __this_cpu_read(mod->refptr->incs) + __this_cpu_read(mod->refptr->decs))
+#else
+		tp_assign(refcnt, refcnt)
+#endif
 		tp_strcpy(name, mod->name)
 	),
 
@@ -91,16 +98,28 @@ DECLARE_EVENT_CLASS(module_refcnt,
 
 DEFINE_EVENT(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
 )
 
 DEFINE_EVENT(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 */