Rewrite last GPL bits in relay.c and relay.h

[ust.git] / libust / tracer.c

diff --git a/libust/tracer.c b/libust/tracer.c
index ce3bfd012e0bd83a3920c5e0bbdacb034acbd785..e3538e0d5706e86368e03136fdaf98255525b86d 100644 (file)
--- a/libust/tracer.c
+++ b/libust/tracer.c
@@ -52,11 +52,12 @@
 //ust// #include <linux/delay.h>
 //ust// #include <linux/vmalloc.h>
 //ust// #include <asm/atomic.h>
+#include <urcu-bp.h>
 #include <urcu/rculist.h>
 
 #include <ust/kernelcompat.h>
-#include <ust/tracer.h>
 #include "tracercore.h"
+#include "tracer.h"
 #include "usterr.h"
 
 //ust// static void async_wakeup(unsigned long data);
@@ -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];