Namespace kernel version macros

[lttng-modules.git] / tests / probes / lttng-test.c

diff --git a/tests/probes/lttng-test.c b/tests/probes/lttng-test.c
index 42e48cf2be41ade450d2e2a3a989bfbe924f35a7..d550398e4d7e6cf4ca71ad192deca77d0b8b6821 100644 (file)
--- a/tests/probes/lttng-test.c
+++ b/tests/probes/lttng-test.c
@@ -16,7 +16,6 @@
 #include <lttng-events.h>
 #include <lttng-tracer.h>
 #include <wrapper/tracepoint.h>
-#include <wrapper/kstrtox.h>
 
 #define TP_MODULE_NOAUTOLOAD
 #define LTTNG_PACKAGE_BUILD
@@ -26,7 +25,12 @@
 #define LTTNG_INSTRUMENTATION
 #include <instrumentation/events/lttng-module/lttng-test.h>
 
-DEFINE_TRACE(lttng_test_filter_event);
+LTTNG_DEFINE_TRACE(lttng_test_filter_event,
+       PARAMS(int anint, int netint, long *values,
+               char *text, size_t textlen,
+               char *etext, uint32_t * net_values),
+       PARAMS(anint, netint, values, text, textlen, etext, net_values)
+);
 
 #define LTTNG_TEST_FILTER_EVENT_FILE   "lttng-test-filter-event"
 
@@ -69,7 +73,7 @@ ssize_t lttng_test_filter_event_write(struct file *file, const char __user *user
        int ret;
 
        /* Get the number of iterations */
-       ret = lttng_kstrtouint_from_user(user_buf, count, 10, &nr_iter);
+       ret = kstrtouint_from_user(user_buf, count, 10, &nr_iter);
        if (ret) {
                written = ret;
                goto end;
@@ -82,9 +86,15 @@ end:
        return written;
 }
 
-static const struct file_operations lttng_test_filter_event_operations = {
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,6,0))
+static const struct proc_ops lttng_test_filter_event_proc_ops = {
+       .proc_write = lttng_test_filter_event_write,
+};
+#else
+static const struct file_operations lttng_test_filter_event_proc_ops = {
        .write = lttng_test_filter_event_write,
 };
+#endif
 
 static
 int __init lttng_test_init(void)
@@ -92,11 +102,11 @@ int __init lttng_test_init(void)
        int ret = 0;
 
        (void) wrapper_lttng_fixup_sig(THIS_MODULE);
-       wrapper_vmalloc_sync_all();
+       wrapper_vmalloc_sync_mappings();
        lttng_test_filter_event_dentry =
                        proc_create_data(LTTNG_TEST_FILTER_EVENT_FILE,
                                S_IRUGO | S_IWUGO, NULL,
-                               &lttng_test_filter_event_operations, NULL);
+                               &lttng_test_filter_event_proc_ops, NULL);
        if (!lttng_test_filter_event_dentry) {
                printk(KERN_ERR "Error creating LTTng test filter file\n");
                ret = -ENOMEM;