Adapt to 3.15 tracepoint API

[lttng-modules.git] / wrapper / tracepoint.h

diff --git a/wrapper/tracepoint.h b/wrapper/tracepoint.h
index 5f429db7585ddb7c7edecf1abd359cb09bc15918..d094f42ac3695fafa6593f63780410b1734bb8e5 100644 (file)
--- a/wrapper/tracepoint.h
+++ b/wrapper/tracepoint.h
@@ -37,11 +37,34 @@
 
 #define kabi_2635_tracepoint_probe_register tracepoint_probe_register
 #define kabi_2635_tracepoint_probe_unregister tracepoint_probe_unregister
-#define kabi_2635_tracepoint_probe_register_noupdate tracepoint_probe_register_noupdate
-#define kabi_2635_tracepoint_probe_unregister_noupdate tracepoint_probe_unregister_noupdate
 
 #endif /* HAVE_KABI_2635_TRACEPOINT */
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0))
+
+#include "../lttng-tracepoint.h"
+
+#define lttng_wrapper_tracepoint_probe_register lttng_tracepoint_probe_register
+#define lttng_wrapper_tracepoint_probe_unregister lttng_tracepoint_probe_unregister
+
+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0)) */
+
+#define lttng_wrapper_tracepoint_probe_register kabi_2635_tracepoint_probe_register
+#define lttng_wrapper_tracepoint_probe_unregister kabi_2635_tracepoint_probe_unregister
+
+static inline
+int lttng_tracepoint_init(void)
+{
+       return 0;
+}
+
+static inline
+void lttng_tracepoint_exit(void)
+{
+}
+
+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0)) */
+
 #ifdef CONFIG_MODULE_SIG
 
 #include <linux/kallsyms.h>