From b7ea1a1c8ed1cea410bb43c7cc6621c951e4b621 Mon Sep 17 00:00:00 2001
From: Pierre-Marc Fournier <pierre-marc.fournier@polymtl.ca>
Date: Mon, 5 Oct 2009 15:40:54 -0400
Subject: [PATCH] use liburcu-bp

---
 configure.ac        | 2 +-
 libust/marker.c     | 2 +-
 libust/serialize.c  | 4 ++--
 libust/tracectl.c   | 2 +-
 libust/tracepoint.c | 2 +-
 libust/tracepoint.h | 2 +-
 libust/tracer.c     | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9137366..9bf9c2c 100644
--- 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 ff3de64..ff01f42 100644
--- 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 2fe6db7..0055d99 100644
--- 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 faa4714..b20fe69 100644
--- 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 ee335ad..df94b2c 100644
--- 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 5adb7c6..b1ee16d 100644
--- 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 6f19213..4150551 100644
--- 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"
-- 
2.34.1