X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;ds=sidebyside;f=lttng-abi.c;h=386c4e31fe8f9b57099e143b1515d9319135e0f1;hb=b53047135828b997a4eeb2cae7344cb169aa9c8c;hp=fb970a6926ce0eec2d61199f8dedc470ad9eab1f;hpb=345227390cf2884995aa36de35e3e4fc0178c601;p=lttng-modules.git

diff --git a/lttng-abi.c b/lttng-abi.c
index fb970a69..386c4e31 100644
--- a/lttng-abi.c
+++ b/lttng-abi.c
@@ -31,16 +31,16 @@
 #include <linux/slab.h>
 #include <linux/err.h>
 #include <linux/kref.h>
-#include <wrapper/ringbuffer/vfs.h>
-#include <wrapper/ringbuffer/backend.h>
-#include <wrapper/ringbuffer/frontend.h>
-#include <lttng-string-utils.h>
-#include <lttng-abi.h>
-#include <lttng-abi-old.h>
-#include <lttng-events.h>
-#include <lttng-tracer.h>
-#include <lttng-tp-mempool.h>
-#include <lib/ringbuffer/frontend_types.h>
+#include <ringbuffer/vfs.h>
+#include <ringbuffer/backend.h>
+#include <ringbuffer/frontend.h>
+#include <lttng/lttng-string-utils.h>
+#include <lttng/lttng-abi.h>
+#include <lttng/lttng-abi-old.h>
+#include <lttng/lttng-events.h>
+#include <lttng/lttng-tracer.h>
+#include <lttng/lttng-tp-mempool.h>
+#include <ringbuffer/frontend_types.h>
 
 /*
  * This is LTTng's own personal way to create a system call as an external
@@ -49,11 +49,7 @@
 
 static struct proc_dir_entry *lttng_proc_dentry;
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0))
 static const struct proc_ops lttng_proc_ops;
-#else
-static const struct file_operations lttng_proc_ops;
-#endif
 
 static const struct file_operations lttng_session_fops;
 static const struct file_operations lttng_channel_fops;
@@ -394,22 +390,12 @@ long lttng_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 	}
 }
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0))
 static const struct proc_ops lttng_proc_ops = {
 	.proc_ioctl = lttng_ioctl,
 #ifdef CONFIG_COMPAT
 	.proc_compat_ioctl = lttng_ioctl,
 #endif /* CONFIG_COMPAT */
 };
-#else
-static const struct file_operations lttng_proc_ops = {
-	.owner = THIS_MODULE,
-	.unlocked_ioctl = lttng_ioctl,
-#ifdef CONFIG_COMPAT
-	.compat_ioctl = lttng_ioctl,
-#endif /* CONFIG_COMPAT */
-};
-#endif
 
 static
 int lttng_abi_create_channel(struct file *session_file,