X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;ds=sidebyside;f=lttng-events.c;h=24e817bd47d4d8c1cee894e4e34653b0f47d1d24;hb=46e25482873e8c85b547db4cec1734f127b27488;hp=61439ec7c788efa49b3a4c910fe2d9c0a2cf79d6;hpb=a230fd6d07ab3c99a385f5b17ef0bfe055f47653;p=lttng-modules.git

diff --git a/lttng-events.c b/lttng-events.c
index 61439ec7..24e817bd 100644
--- a/lttng-events.c
+++ b/lttng-events.c
@@ -23,7 +23,6 @@
 #include <linux/seq_file.h>
 #include <linux/file.h>
 #include <linux/anon_inodes.h>
-#include <wrapper/file.h>
 #include <linux/jhash.h>
 #include <linux/uaccess.h>
 #include <linux/uuid.h>
@@ -31,7 +30,6 @@
 #include <linux/vmalloc.h>
 
 #include <wrapper/random.h>
-#include <wrapper/tracepoint.h>
 #include <wrapper/list.h>
 #include <wrapper/types.h>
 #include <lttng-kernel-version.h>
@@ -40,6 +38,7 @@
 #include <lttng-abi-old.h>
 #include <lttng-endian.h>
 #include <lttng-string-utils.h>
+#include <lttng-tracepoint.h>
 #include <wrapper/ringbuffer/backend.h>
 #include <wrapper/ringbuffer/frontend.h>
 
@@ -822,9 +821,9 @@ void register_event(struct lttng_event *event)
 	desc = event->desc;
 	switch (event->instrumentation) {
 	case LTTNG_KERNEL_TRACEPOINT:
-		ret = lttng_wrapper_tracepoint_probe_register(desc->kname,
-						  desc->probe_callback,
-						  event);
+		ret = lttng_tracepoint_probe_register(desc->kname,
+						desc->probe_callback,
+						event);
 		break;
 	case LTTNG_KERNEL_SYSCALL:
 		ret = lttng_syscall_filter_enable(event->chan,
@@ -858,7 +857,7 @@ int _lttng_event_unregister(struct lttng_event *event)
 	desc = event->desc;
 	switch (event->instrumentation) {
 	case LTTNG_KERNEL_TRACEPOINT:
-		ret = lttng_wrapper_tracepoint_probe_unregister(event->desc->kname,
+		ret = lttng_tracepoint_probe_unregister(event->desc->kname,
 						  event->desc->probe_callback,
 						  event);
 		break;
@@ -1139,7 +1138,7 @@ int lttng_session_list_tracker_ids(struct lttng_session *session,
 	struct seq_file *m;
 	int file_fd, ret;
 
-	file_fd = lttng_get_unused_fd();
+	file_fd = get_unused_fd_flags(0);
 	if (file_fd < 0) {
 		ret = file_fd;
 		goto fd_error;
@@ -2937,9 +2936,6 @@ static int __init lttng_events_init(void)
 {
 	int ret;
 
-	ret = wrapper_lttng_fixup_sig(THIS_MODULE);
-	if (ret)
-		return ret;
 	ret = wrapper_get_pfnblock_flags_mask_init();
 	if (ret)
 		return ret;