projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: Move lttng-modules instrumentation headers
[lttng-modules.git]
/
tests
/
probes
/
lttng-test.c
diff --git
a/tests/probes/lttng-test.c
b/tests/probes/lttng-test.c
index 42e48cf2be41ade450d2e2a3a989bfbe924f35a7..5064a685dad971693e3ee3bd04edb77491cbe2d3 100644
(file)
--- a/
tests/probes/lttng-test.c
+++ b/
tests/probes/lttng-test.c
@@
-1,4
+1,4
@@
-/* SPDX-License-Identifier: (GPL-2.0
or LGPL-2.1
)
+/* SPDX-License-Identifier: (GPL-2.0
-only or LGPL-2.1-only
)
*
* lttng-test.c
*
*
* lttng-test.c
*
@@
-13,18
+13,17
@@
#include <linux/byteorder/generic.h>
#include <asm/byteorder.h>
#include <linux/byteorder/generic.h>
#include <asm/byteorder.h>
-#include <lttng
-
events.h>
-#include <lttng
-
tracer.h>
+#include <lttng
/
events.h>
+#include <lttng
/
tracer.h>
#include <wrapper/tracepoint.h>
#include <wrapper/tracepoint.h>
-#include <wrapper/kstrtox.h>
#define TP_MODULE_NOAUTOLOAD
#define LTTNG_PACKAGE_BUILD
#define CREATE_TRACE_POINTS
#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-test
#define LTTNG_INSTRUMENTATION
#define TRACE_INCLUDE_FILE lttng-test
#define LTTNG_INSTRUMENTATION
-#include <instrumentation/events/lttng-
module/lttng-
test.h>
+#include <instrumentation/events/lttng-test.h>
DEFINE_TRACE(lttng_test_filter_event);
DEFINE_TRACE(lttng_test_filter_event);
@@
-69,7
+68,7
@@
ssize_t lttng_test_filter_event_write(struct file *file, const char __user *user
int ret;
/* Get the number of iterations */
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;
if (ret) {
written = ret;
goto end;
@@
-82,9
+81,15
@@
end:
return written;
}
return written;
}
-static const struct file_operations lttng_test_filter_event_operations = {
+#if (LINUX_VERSION_CODE >= 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,
};
.write = lttng_test_filter_event_write,
};
+#endif
static
int __init lttng_test_init(void)
static
int __init lttng_test_init(void)
@@
-92,11
+97,11
@@
int __init lttng_test_init(void)
int ret = 0;
(void) wrapper_lttng_fixup_sig(THIS_MODULE);
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_dentry =
proc_create_data(LTTNG_TEST_FILTER_EVENT_FILE,
S_IRUGO | S_IWUGO, NULL,
- <tng_test_filter_event_
operation
s, NULL);
+ <tng_test_filter_event_
proc_op
s, NULL);
if (!lttng_test_filter_event_dentry) {
printk(KERN_ERR "Error creating LTTng test filter file\n");
ret = -ENOMEM;
if (!lttng_test_filter_event_dentry) {
printk(KERN_ERR "Error creating LTTng test filter file\n");
ret = -ENOMEM;
This page took
0.026314 seconds
and
4
git commands to generate.