X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Finstrumentation%2Fevents%2Fmodule.h;h=06b20c64ae1291bddb7b92ca7156da360961e838;hb=464034ba99789e459e85685c467dd4ab9ab6e1a9;hp=3de0f0e6c53bac35cf7405a6d771bb16eaf37529;hpb=5f1c794bcce39ee8c401c735cf7e1907c0bc20fe;p=lttng-modules.git

diff --git a/include/instrumentation/events/module.h b/include/instrumentation/events/module.h
index 3de0f0e6..06b20c64 100644
--- a/include/instrumentation/events/module.h
+++ b/include/instrumentation/events/module.h
@@ -16,7 +16,7 @@
 #define LTTNG_TRACE_MODULE_H
 
 #include <lttng/tracepoint-event.h>
-#include <linux/version.h>
+#include <lttng/kernel-version.h>
 #include <linux/kernel.h>
 
 #ifdef CONFIG_MODULES
@@ -31,7 +31,11 @@ LTTNG_TRACEPOINT_ENUM(taint,
 	TP_ENUM_VALUES(
 		ctf_enum_value("PROPRIETARY_MODULE", 1UL << TAINT_PROPRIETARY_MODULE)
 		ctf_enum_value("FORCED_MODULE", 1UL << TAINT_FORCED_MODULE)
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,15,0))
 		ctf_enum_value("CPU_OUT_OF_SPEC", 1UL << TAINT_CPU_OUT_OF_SPEC)
+#else
+		ctf_enum_value("UNSAFE_SMP", 1UL << TAINT_UNSAFE_SMP)
+#endif
 		ctf_enum_value("FORCED_RMMOD", 1UL << TAINT_FORCED_RMMOD)
 		ctf_enum_value("MACHINE_CHECK", 1UL << TAINT_MACHINE_CHECK)
 		ctf_enum_value("BAD_PAGE", 1UL << TAINT_BAD_PAGE)
@@ -41,22 +45,22 @@ LTTNG_TRACEPOINT_ENUM(taint,
 		ctf_enum_value("WARN", 1UL << TAINT_WARN)
 		ctf_enum_value("CRAP", 1UL << TAINT_CRAP)
 		ctf_enum_value("FIRMWARE_WORKAROUND", 1UL << TAINT_FIRMWARE_WORKAROUND)
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,2,0))
 		ctf_enum_value("OOT_MODULE", 1UL << TAINT_OOT_MODULE)
 #endif
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,15,0))
 		ctf_enum_value("UNSIGNED_MODULE", 1UL << TAINT_UNSIGNED_MODULE)
 #endif
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,17,0))
 		ctf_enum_value("SOFTLOCKUP", 1UL << TAINT_SOFTLOCKUP)
 #endif
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,0,0))
 		ctf_enum_value("LIVEPATCH", 1UL << TAINT_LIVEPATCH)
 #endif
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,15,0))
 		ctf_enum_value("AUX", 1UL << TAINT_AUX)
 #endif
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,17,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,17,0))
 		ctf_enum_value("RANDSTRUCT", 1UL << TAINT_RANDSTRUCT)
 #endif
 	)
@@ -96,7 +100,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(module_refcnt,
 
 	TP_FIELDS(
 		ctf_integer_hex(unsigned long, ip, ip)
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,19,0))
 		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))