X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-syscalls.c;h=5fcbe6fc55ce955de7a056b81dc83003cebcbd16;hb=b53047135828b997a4eeb2cae7344cb169aa9c8c;hp=18a906a48f3f3a05ba58523204c46b78555e46c3;hpb=b97bc8bf7a103253b8ccafc802a68e0e9854bf78;p=lttng-modules.git

diff --git a/lttng-syscalls.c b/lttng-syscalls.c
index 18a906a4..5fcbe6fc 100644
--- a/lttng-syscalls.c
+++ b/lttng-syscalls.c
@@ -22,10 +22,9 @@
 #include <asm/ptrace.h>
 #include <asm/syscall.h>
 
-#include <lib/bitfield.h>
-#include <wrapper/rcu.h>
-#include <lttng-events.h>
-#include "lttng-tracepoint.h"
+#include <lttng/bitfield.h>
+#include <lttng/lttng-events.h>
+#include <lttng/lttng-tracepoint.h>
 
 #define LTTNG_SYSCALL_NR_ARGS	6
 
@@ -82,9 +81,7 @@ struct timeval;
 struct itimerval;
 struct itimerspec;
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0))
 typedef __kernel_old_time_t time_t;
-#endif
 
 #ifdef IA32_NR_syscalls
 #define NR_compat_syscalls IA32_NR_syscalls
@@ -394,7 +391,7 @@ void syscall_entry_probe(void *__data, struct pt_regs *regs, long id)
 	if (unlikely(in_compat_syscall())) {
 		struct lttng_syscall_filter *filter;
 
-		filter = lttng_rcu_dereference(chan->sc_filter);
+		filter = rcu_dereference_raw_check(chan->sc_filter);
 		if (filter) {
 			if (id < 0 || id >= NR_compat_syscalls
 				|| !test_bit(id, filter->sc_compat)) {
@@ -408,7 +405,7 @@ void syscall_entry_probe(void *__data, struct pt_regs *regs, long id)
 	} else {
 		struct lttng_syscall_filter *filter;
 
-		filter = lttng_rcu_dereference(chan->sc_filter);
+		filter = rcu_dereference_raw_check(chan->sc_filter);
 		if (filter) {
 			if (id < 0 || id >= NR_syscalls
 				|| !test_bit(id, filter->sc)) {
@@ -548,7 +545,7 @@ void syscall_exit_probe(void *__data, struct pt_regs *regs, long ret)
 	if (unlikely(in_compat_syscall())) {
 		struct lttng_syscall_filter *filter;
 
-		filter = lttng_rcu_dereference(chan->sc_filter);
+		filter = rcu_dereference_raw_check(chan->sc_filter);
 		if (filter) {
 			if (id < 0 || id >= NR_compat_syscalls
 				|| !test_bit(id, filter->sc_compat)) {
@@ -562,7 +559,7 @@ void syscall_exit_probe(void *__data, struct pt_regs *regs, long ret)
 	} else {
 		struct lttng_syscall_filter *filter;
 
-		filter = lttng_rcu_dereference(chan->sc_filter);
+		filter = rcu_dereference_raw_check(chan->sc_filter);
 		if (filter) {
 			if (id < 0 || id >= NR_syscalls
 				|| !test_bit(id, filter->sc)) {