cleanups

diff --git a/libust/serialize.c b/libust/serialize.c
index 04ece912b056f34164663a10e09dd4e4909ebab0..b8df1b3cd3538af4a75cd1bcd6aa955c5c7892f8 100644 (file)
--- a/libust/serialize.c
+++ b/libust/serialize.c
@@ -22,6 +22,7 @@
 #include "kernelcompat.h"
 #define _LGPL_SOURCE
 #include <urcu.h>
+#include <kcompat/rculist.h>
 
 #include "relay.h"
 #include "tracer.h"
@@ -587,7 +588,7 @@ notrace void ltt_vtrace(const struct marker *mdata, void *probe_data,
        struct ltt_serialize_closure closure;
        struct ltt_probe_private_data *private_data = call_data;
        void *serialize_private = NULL;
-       int cpu;
+//ust//        int cpu;
        unsigned int rflags;
 
        /*
@@ -598,7 +599,7 @@ notrace void ltt_vtrace(const struct marker *mdata, void *probe_data,
                return;
 
        rcu_read_lock(); //ust// rcu_read_lock_sched_notrace();
-       cpu = smp_processor_id();
+//ust//        cpu = smp_processor_id();
 //ust//        __get_cpu_var(ltt_nesting)++;
        ltt_nesting++;
 

diff --git a/libust/tracer.c b/libust/tracer.c
index d3978a45f6b94689bff8bf0c6021aba29d6cd6ae..b0393e213e217de881dfeb4a7d7a3af599d674aa 100644 (file)
--- a/libust/tracer.c
+++ b/libust/tracer.c
@@ -38,6 +38,8 @@
 //ust// #include <linux/delay.h>
 //ust// #include <linux/vmalloc.h>
 //ust// #include <asm/atomic.h>
+#include <kcompat/rculist.h>
+
 #include "kernelcompat.h"
 #include "tracercore.h"
 #include "tracer.h"

diff --git a/share/kernelcompat.h b/share/kernelcompat.h
index c03b4086880c8ff2cd9a9f1dde973b4935c350a9..3c23ac99477b8d95e4c367b59f58d7c95daf4834 100644 (file)
--- a/share/kernelcompat.h
+++ b/share/kernelcompat.h
@@ -188,14 +188,4 @@ static inline u32 trace_clock_freq_scale(void)
 }
 
 
-/* LISTS */
-
-#define list_add_rcu list_add
-#define list_for_each_entry_rcu list_for_each_entry
-
-
-#define EXPORT_SYMBOL_GPL(a) /*nothing*/
-
-#define smp_processor_id() (-1)
-
 #endif /* KERNELCOMPAT_H */