projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move wrapper/ringbuffer to include/ringbuffer
[lttng-modules.git]
/
lttng-abi.c
diff --git
a/lttng-abi.c
b/lttng-abi.c
index fb970a6926ce0eec2d61199f8dedc470ad9eab1f..a32f419a4437b02806e9f584713aefc6bc8d3a02 100644
(file)
--- a/
lttng-abi.c
+++ b/
lttng-abi.c
@@
-31,9
+31,9
@@
#include <linux/slab.h>
#include <linux/err.h>
#include <linux/kref.h>
#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 <
include
/ringbuffer/vfs.h>
+#include <
include
/ringbuffer/backend.h>
+#include <
include
/ringbuffer/frontend.h>
#include <lttng-string-utils.h>
#include <lttng-abi.h>
#include <lttng-abi-old.h>
#include <lttng-string-utils.h>
#include <lttng-abi.h>
#include <lttng-abi-old.h>
@@
-49,11
+49,7
@@
static struct proc_dir_entry *lttng_proc_dentry;
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;
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;
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 */
};
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,
static
int lttng_abi_create_channel(struct file *session_file,
This page took
0.025454 seconds
and
4
git commands to generate.