make compatible with new version of libkcompat

[ust.git] / libust / serialize.c

diff --git a/libust/serialize.c b/libust/serialize.c
index bef01780e6bfbdb70179ce30577e00bf863836b4..00ba4870821c084476a2f08c735d0aaded30e8d5 100644 (file)
--- a/libust/serialize.c
+++ b/libust/serialize.c
@@ -18,10 +18,14 @@
 //ust// #include <linux/ltt-tracer.h>
 #include <string.h>
 #include <stdint.h>
+
 #include "kernelcompat.h"
+#define _LGPL_SOURCE
+#include <urcu.h>
+
 #include "relay.h"
 #include "tracer.h"
-#include "list.h"
+//#include "list.h"
 #include "usterr.h"
 
 enum ltt_type {
@@ -593,7 +597,7 @@ notrace void ltt_vtrace(const struct marker *mdata, void *probe_data,
        if (unlikely(ltt_traces.num_active_traces == 0))
                return;
 
-       rcu_read_lock_sched_notrace();
+       rcu_read_lock(); //ust// rcu_read_lock_sched_notrace();
        cpu = smp_processor_id();
 //ust//        __get_cpu_var(ltt_nesting)++;
        ltt_nesting++;
@@ -671,12 +675,12 @@ notrace void ltt_vtrace(const struct marker *mdata, void *probe_data,
                va_end(args_copy);
                /* Out-of-order commit */
                ltt_commit_slot(channel, &transport_data, buf_offset,
-                               slot_size);
+                               data_size, slot_size);
                printf("just commited event at offset %d and size %d\n", buf_offset, slot_size);
        }
 //ust//        __get_cpu_var(ltt_nesting)--;
        ltt_nesting--;
-       rcu_read_unlock_sched_notrace();
+       rcu_read_unlock(); //ust// rcu_read_unlock_sched_notrace();
 }
 EXPORT_SYMBOL_GPL(ltt_vtrace);