-/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
*
* lttng.c
*
#include <linux/mm.h>
#include <linux/miscdevice.h>
#include <wrapper/vmalloc.h>
-#include <lttng-events.h>
+#include <lttng/events.h>
#define TP_MODULE_NOAUTOLOAD
#define LTTNG_PACKAGE_BUILD
#define CREATE_TRACE_POINTS
-#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module
+#define TRACE_INCLUDE_PATH instrumentation/events
#define TRACE_INCLUDE_FILE lttng
#define LTTNG_INSTRUMENTATION
-#include <instrumentation/events/lttng-module/lttng.h>
+#include <instrumentation/events/lttng.h>
/* Events written through logger are truncated at 1024 bytes */
#define LTTNG_LOGGER_COUNT_MAX 1024
.write = lttng_logger_write,
};
+/*
+ * Linux 5.6 introduced a separate proc_ops struct for /proc operations
+ * to decouple it from the vfs.
+ */
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0))
+static const struct proc_ops lttng_logger_proc_ops = {
+ .proc_write = lttng_logger_write,
+};
+#else
+#define lttng_logger_proc_ops lttng_logger_operations
+#endif
+
static struct miscdevice logger_dev = {
.minor = MISC_DYNAMIC_MINOR,
.name = "lttng-logger",
{
int ret = 0;
- wrapper_vmalloc_sync_all();
+ wrapper_vmalloc_sync_mappings();
/* /dev/lttng-logger */
ret = misc_register(&logger_dev);
/* /proc/lttng-logger */
lttng_logger_dentry = proc_create_data(LTTNG_LOGGER_FILE,
S_IRUGO | S_IWUGO, NULL,
- <tng_logger_operations, NULL);
+ <tng_logger_proc_ops, NULL);
if (!lttng_logger_dentry) {
printk(KERN_ERR "Error creating LTTng logger proc file\n");
ret = -ENOMEM;