X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flttng-events.c;h=e785fe4dbc46a1f1e81c0b96fa16850d294fbcd5;hb=05355f0bf8b4292ab7b8dc93571a568833b0a3c2;hp=8d2bf46991d78703a2bbeed96333282211319600;hpb=860c213b645593fa19d7a3abf7ffdd1282f0a1c6;p=lttng-modules.git

diff --git a/src/lttng-events.c b/src/lttng-events.c
index 8d2bf469..e785fe4d 100644
--- a/src/lttng-events.c
+++ b/src/lttng-events.c
@@ -93,7 +93,8 @@ int _lttng_field_statedump(struct lttng_kernel_session *session,
 
 void synchronize_trace(void)
 {
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,1,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,1,0) || \
+	LTTNG_RHEL_KERNEL_RANGE(4,18,0,193,0,0, 4,19,0,0,0,0))
 	synchronize_rcu();
 #else
 	synchronize_sched();
@@ -2924,7 +2925,7 @@ int lttng_metadata_output_channel(struct lttng_metadata_stream *stream,
 	}
 	stream->transport->ops.event_write(&ctx,
 			stream->metadata_cache->data + stream->metadata_in,
-			reserve_len);
+			reserve_len, 1);
 	stream->transport->ops.event_commit(&ctx);
 	stream->metadata_in += reserve_len;
 	if (reserve_len < len)
@@ -4362,6 +4363,9 @@ static int __init lttng_events_init(void)
 #else
 		"");
 #endif
+#ifdef CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM
+	printk(KERN_NOTICE "LTTng: Experimental bitwise enum enabled.\n");
+#endif /* CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM */
 	return 0;
 
 error_hotplug: