X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libust%2Ftracer.c;h=e3538e0d5706e86368e03136fdaf98255525b86d;hb=a53110051c34d7f46c584e3bccd927b213930d05;hp=6f192130df269e7820df085bed8cc464684c56d9;hpb=99b72dc0657875cee4a10bf4c855e99a1b1d1f9c;p=lttng-ust.git

diff --git a/libust/tracer.c b/libust/tracer.c
index 6f192130..e3538e0d 100644
--- a/libust/tracer.c
+++ b/libust/tracer.c
@@ -52,9 +52,10 @@
 //ust// #include <linux/delay.h>
 //ust// #include <linux/vmalloc.h>
 //ust// #include <asm/atomic.h>
-#include <kcompat/rculist.h>
+#include <urcu-bp.h>
+#include <urcu/rculist.h>
 
-#include "kernelcompat.h"
+#include <ust/kernelcompat.h>
 #include "tracercore.h"
 #include "tracer.h"
 #include "usterr.h"
@@ -295,7 +296,7 @@ void notrace ltt_write_trace_header(struct ltt_trace_struct *trace,
 static void trace_async_wakeup(struct ltt_trace_struct *trace)
 {
 	int i;
-	struct ltt_channel_struct *chan;
+	struct ust_channel *chan;
 
 	/* Must check each channel for pending read wakeup */
 	for (i = 0; i < trace->nr_channels; i++) {
@@ -737,7 +738,6 @@ int ltt_trace_alloc(const char *trace_name)
 		subbuf_cnt = trace->channels[chan].subbuf_cnt;
 		prepare_chan_size_num(&subbuf_size, &subbuf_cnt);
 		err = trace->ops->create_channel(trace_name, trace,
-				trace->dentry.trace_root,
 				channel_name,
 				&trace->channels[chan],
 				subbuf_size,
@@ -846,7 +846,7 @@ traces_error:
 static void __ltt_trace_destroy(struct ltt_trace_struct	*trace)
 {
 	int i;
-	struct ltt_channel_struct *chan;
+	struct ust_channel *chan;
 
 	for (i = 0; i < trace->nr_channels; i++) {
 		chan = &trace->channels[i];