use liburcu-bp

diff --git a/configure.ac b/configure.ac
index 9137366551d363462ce60182114719c3b8402c8d..9bf9c2ceb2d77989471ff82a8cfbd7dba401867c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -53,7 +53,7 @@ AC_CHECK_FUNCS([gettimeofday munmap socket strerror strtol])
 AC_ARG_WITH(urcu, [  --with-urcu path        Path to userspace RCU source], [
        AC_CHECK_FILE(["$withval/urcu.h"], [
                URCU_CFLAGS="-I$withval"
-               URCU_LIBS="-L$withval -lurcu" ],
+               URCU_LIBS="-L$withval -lurcu-bp" ],
                AC_MSG_ERROR([Cannot find urcu.h in urcu directory]))
 ], [
        PKG_CHECK_MODULES(URCU, [liburcu], , [

diff --git a/libust/marker.c b/libust/marker.c
index ff3de64855e7c72e8394e02832484bf710ee7b39..ff01f42e01d85ab7a4b6c3106305e591b1fc2ce1 100644 (file)
--- a/libust/marker.c
+++ b/libust/marker.c
@@ -31,7 +31,7 @@
 //ust// #include <linux/ltt-tracer.h>
 
 #define _LGPL_SOURCE
-#include <urcu.h>
+#include <urcu-bp.h>
 
 #include "kernelcompat.h"
 

diff --git a/libust/serialize.c b/libust/serialize.c
index 2fe6db779e106d59aa21c50969a7d7bc75766ed2..0055d99403e0bd57f63fa4d4db478d642c50e58c 100644 (file)
--- a/libust/serialize.c
+++ b/libust/serialize.c
@@ -34,8 +34,8 @@
 
 #include "kernelcompat.h"
 #define _LGPL_SOURCE
-#include <urcu.h>
-#include <kcompat/rculist.h>
+#include <urcu-bp.h>
+#include <urcu/rculist.h>
 
 #include "relay.h"
 #include "tracer.h"

diff --git a/libust/tracectl.c b/libust/tracectl.c
index faa471461c71c901b9399682ac019f0cb8fe1c13..b20fe696139ea413cbf419daea0190fb27ef675b 100644 (file)
--- a/libust/tracectl.c
+++ b/libust/tracectl.c
@@ -27,7 +27,7 @@
 #include <poll.h>
 #include <regex.h>
 
-#include <urcu.h>
+#include <urcu-bp.h>
 
 #include "marker.h"
 #include "tracer.h"

diff --git a/libust/tracepoint.c b/libust/tracepoint.c
index ee335adfbf20e827c326574fc02d1b99e5ec1661..df94b2cb4c15e7acc091a410de0265251ea52083 100644 (file)
--- a/libust/tracepoint.c
+++ b/libust/tracepoint.c
@@ -38,7 +38,7 @@
 //#include "list.h"
 
 #define _LGPL_SOURCE
-#include <urcu.h>
+#include <urcu-bp.h>
 
 //extern struct tracepoint __start___tracepoints[] __attribute__((visibility("hidden")));
 //extern struct tracepoint __stop___tracepoints[] __attribute__((visibility("hidden")));

diff --git a/libust/tracepoint.h b/libust/tracepoint.h
index 5adb7c6207434fbaf1abbbca5382b2fe3ee711a2..b1ee16d0c7dd6989fc428062cb3d168cd74ce38f 100644 (file)
--- a/libust/tracepoint.h
+++ b/libust/tracepoint.h
@@ -29,7 +29,7 @@
 //#include <linux/rcupdate.h>
 
 #define _LGPL_SOURCE
-#include <urcu.h>
+#include <urcu-bp.h>
 
 #include "immediate.h"
 #include "kernelcompat.h"

diff --git a/libust/tracer.c b/libust/tracer.c
index 6f192130df269e7820df085bed8cc464684c56d9..4150551af9efb09a028878a3eb4b19116a4441d8 100644 (file)
--- a/libust/tracer.c
+++ b/libust/tracer.c
@@ -52,7 +52,7 @@
 //ust// #include <linux/delay.h>
 //ust// #include <linux/vmalloc.h>
 //ust// #include <asm/atomic.h>
-#include <kcompat/rculist.h>
+#include <urcu/rculist.h>
 
 #include "kernelcompat.h"
 #include "tracercore.h"