Drop 'linux/uprobes.h' wrapper

[lttng-modules.git] / src / probes / lttng.c

diff --git a/src/probes/lttng.c b/src/probes/lttng.c
index 8a0dd4b8acdcefe06015d37d2599bb01ef7b907b..98558567894e263980f8302eb6d54cbb3ec6d81c 100644 (file)
--- a/src/probes/lttng.c
+++ b/src/probes/lttng.c
@@ -8,7 +8,7 @@
  */
 
 #include <linux/module.h>
-#include <linux/tracepoint.h>
+#include <wrapper/tracepoint.h>
 #include <linux/uaccess.h>
 #include <linux/gfp.h>
 #include <linux/fs.h>
@@ -32,7 +32,10 @@
 #define LTTNG_LOGGER_COUNT_MAX 1024
 #define LTTNG_LOGGER_FILE      "lttng-logger"
 
-DEFINE_TRACE(lttng_logger);
+LTTNG_DEFINE_TRACE(lttng_logger,
+       PARAMS(const char __user *text, size_t len),
+       PARAMS(text, len)
+);
 
 static struct proc_dir_entry *lttng_logger_dentry;
 
@@ -97,7 +100,7 @@ static const struct file_operations lttng_logger_operations = {
  * 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))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,6,0))
 static const struct proc_ops lttng_logger_proc_ops = {
        .proc_write = lttng_logger_write,
 };
@@ -121,7 +124,7 @@ int __init lttng_logger_init(void)
        /* /dev/lttng-logger */
        ret = misc_register(&logger_dev);
        if (ret) {
-               printk(KERN_ERR "Error creating LTTng logger device\n");
+               printk(KERN_ERR "LTTng: Error creating logger device\n");
                goto error;
        }
 
@@ -130,7 +133,7 @@ int __init lttng_logger_init(void)
                                S_IRUGO | S_IWUGO, NULL,
                                &lttng_logger_proc_ops, NULL);
        if (!lttng_logger_dentry) {
-               printk(KERN_ERR "Error creating LTTng logger proc file\n");
+               printk(KERN_ERR "LTTng: Error creating logger proc file\n");
                ret = -ENOMEM;
                goto error_proc;
        }