X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=lttng-events.c;h=f4206c549c39f7f0d6f62e5a668ad7706b2877ba;hb=d6cd2c9598a06f0ba1ba885bbe754e8836528310;hp=e3a842526dba6af21c5b7d696e7e6424fdb26db8;hpb=0ca42eb7127913b7f35bcacc3bccc8ebedb429c5;p=lttng-modules.git

diff --git a/lttng-events.c b/lttng-events.c
index e3a84252..f4206c54 100644
--- a/lttng-events.c
+++ b/lttng-events.c
@@ -27,8 +27,8 @@
 #include <linux/jhash.h>
 #include <linux/uaccess.h>
 #include <linux/vmalloc.h>
+#include <linux/uuid.h>
 
-#include <wrapper/uuid.h>
 #include <wrapper/vmalloc.h>	/* for wrapper_vmalloc_sync_all() */
 #include <wrapper/random.h>
 #include <wrapper/tracepoint.h>
@@ -75,7 +75,12 @@ int _lttng_field_statedump(struct lttng_session *session,
 
 void synchronize_trace(void)
 {
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,1,0))
+	synchronize_rcu();
+#else
 	synchronize_sched();
+#endif
+
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
 #ifdef CONFIG_PREEMPT_RT_FULL
 	synchronize_rcu();