X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=libust%2Ftracer.c;h=e3538e0d5706e86368e03136fdaf98255525b86d;hb=55c5b393e9b197033ed1a6a8cc8f179412c61bf6;hp=cc1dbfddfd2ffd36fa664cb91c5a35f0ec338e16;hpb=a327294108470b94873a0c248fc02811db98fd64;p=ust.git

diff --git a/libust/tracer.c b/libust/tracer.c
index cc1dbfd..e3538e0 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,
@@ -807,7 +807,7 @@ traces_error:
 //ust// }
 
 /* Must be called while sure that trace is in the list. */
-static int _ltt_trace_destroy(struct ltt_trace_struct	*trace)
+static int _ltt_trace_destroy(struct ltt_trace_struct *trace)
 {
 	int err = -EPERM;
 
@@ -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];