X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Flttng-events.c;h=472440e1770e4ca40000d5ed7c3dd9f219d60727;hb=2a059b14c2cbbf828ebc2fc6db643cf81b51abed;hp=2b4b1039803222cf0e383ad943c6dc991cc1dcb1;hpb=6a338ba4d659df6744bf8489f2248fc2021fbc43;p=lttng-modules.git

diff --git a/src/lttng-events.c b/src/lttng-events.c
index 2b4b1039..472440e1 100644
--- a/src/lttng-events.c
+++ b/src/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/uaccess.h>
 #include <linux/vmalloc.h>
 #include <linux/dmi.h>
@@ -49,6 +48,12 @@
 #include <ringbuffer/frontend.h>
 #include <wrapper/time.h>
 
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,16,0))
+#include <linux/stdarg.h>
+#else
+#include <stdarg.h>
+#endif
+
 #define METADATA_CACHE_DEFAULT_SIZE 4096
 
 static LIST_HEAD(sessions);
@@ -1264,10 +1269,6 @@ struct lttng_kernel_event_common *_lttng_kernel_event_create(struct lttng_event_
 		WARN_ON_ONCE(!ret);
 		break;
 
-	case LTTNG_KERNEL_ABI_FUNCTION:
-		lttng_fallthrough;
-	case LTTNG_KERNEL_ABI_NOOP:
-		lttng_fallthrough;
 	default:
 		WARN_ON_ONCE(1);
 		ret = -EINVAL;
@@ -1767,7 +1768,7 @@ int lttng_session_list_tracker_ids(struct lttng_kernel_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;