X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Ftracepoint-event-impl.h;h=b75a791ea4e3e88e17921c83fab2ffbb08adf49d;hb=8a57ec025ffbe56153748fd69b60118862707182;hp=23c053fcc944283a664746e9481b86b7bde8e1e2;hpb=c2fb9c1c4f890840c02ad4b66a7cf69ae5dca6f7;p=lttng-modules.git

diff --git a/include/lttng/tracepoint-event-impl.h b/include/lttng/tracepoint-event-impl.h
index 23c053fc..b75a791e 100644
--- a/include/lttng/tracepoint-event-impl.h
+++ b/include/lttng/tracepoint-event-impl.h
@@ -20,7 +20,6 @@
 #include <lttng/types.h>
 #include <lttng/probe-user.h>
 #include <lttng/events.h>
-#include <lttng/events-internal.h>	/* TODO: remove this include after refactoring is done. */
 #include <lttng/tracer-core.h>
 #include <lttng/tp-mempool.h>
 
@@ -1004,7 +1003,7 @@ static void __event_probe__##_name(_data_proto)						\
 {											\
 	struct probe_local_vars { _locvar };						\
 	struct lttng_kernel_event_common *__event = __data;				\
-	struct lttng_probe_ctx __lttng_probe_ctx = {					\
+	struct lttng_kernel_probe_ctx __lttng_probe_ctx = {				\
 		.event = __event,							\
 		.interruptible = !irqs_disabled(),					\
 	};										\
@@ -1081,7 +1080,7 @@ static void __event_probe__##_name(_data_proto)						\
 		struct lttng_kernel_event_recorder *__event_recorder =			\
 			container_of(__event, struct lttng_kernel_event_recorder, parent); \
 		struct lttng_channel *__chan = __event_recorder->chan;			\
-		struct lib_ring_buffer_ctx __ctx;					\
+		struct lttng_kernel_ring_buffer_ctx __ctx;				\
 		ssize_t __event_len;							\
 		size_t __event_align;							\
 		int __ret;								\
@@ -1241,12 +1240,12 @@ static __used struct lttng_kernel_probe_desc TP_ID(__probe_desc___, TRACE_SYSTEM
 static int TP_ID(__lttng_events_init__, TRACE_SYSTEM)(void)
 {
 	wrapper_vmalloc_sync_mappings();
-	return lttng_probe_register(&TP_ID(__probe_desc___, TRACE_SYSTEM));
+	return lttng_kernel_probe_register(&TP_ID(__probe_desc___, TRACE_SYSTEM));
 }
 
 static void TP_ID(__lttng_events_exit__, TRACE_SYSTEM)(void)
 {
-	lttng_probe_unregister(&TP_ID(__probe_desc___, TRACE_SYSTEM));
+	lttng_kernel_probe_unregister(&TP_ID(__probe_desc___, TRACE_SYSTEM));
 }
 
 #ifndef TP_MODULE_NOAUTOLOAD