Add experimental bitwise enum config option

[lttng-modules.git] / src / lttng-events.c

diff --git a/src/lttng-events.c b/src/lttng-events.c
index 999080bc490f54be1b129094e32aa909b63fac85..af20bfccd117473051a26f8b6e66629c4b13d6f0 100644 (file)
--- a/src/lttng-events.c
+++ b/src/lttng-events.c
@@ -2880,7 +2880,7 @@ void lttng_event_notifier_group_sync_enablers(struct lttng_event_notifier_group
  * was written and a negative value on error.
  */
 int lttng_metadata_output_channel(struct lttng_metadata_stream *stream,
-               struct channel *chan, bool *coherent)
+               struct lttng_kernel_ring_buffer_channel *chan, bool *coherent)
 {
        struct lttng_kernel_ring_buffer_ctx ctx;
        int ret = 0;
@@ -2924,7 +2924,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 +4362,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: