Update following liburcu changes

Addition of call_rcu in liburcu deprecates the simple.h kcompat header.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/README b/README
index 2d1d570fb6dea370a42279b0d904501a09a6b72d..f4a01016a0e7394fe68de5c8e658d13c03f815d5 100644 (file)
--- a/README
+++ b/README
@@ -16,7 +16,7 @@ PREREQUISITES:
   - liburcu
     Userspace RCU library, by Mathieu Desnoyers and Paul E. McKenney
 
-    -> This release was tested with liburcu v0.5.4
+    -> This release depends on liburcu v0.5.5
 
       * Debian/Ubuntu package: liburcu-dev
       * Website:  http://lttng.org/urcu

diff --git a/include/Makefile.am b/include/Makefile.am
index eedde64ff080681642ea82b5ce0d1fb79763d0ee..bd649b6b6144bcb604eeed9516723b8e6dd75997 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -20,7 +20,6 @@ noinst_HEADERS = \
        ust/kcompat/kcompat.h \
        ust/kcompat/jhash.h \
        ust/kcompat/compiler.h \
-       ust/kcompat/simple.h \
        ust/kcompat/types.h \
        ust/tracectl.h \
        ust/ustctl.h \

diff --git a/include/ust/kcompat/kcompat.h b/include/ust/kcompat/kcompat.h
index 79036509db6dc43196905d4c69a29524bf002ad6..be8d9269ea99dfef6a7a51da1d169951a50a1389 100644 (file)
--- a/include/ust/kcompat/kcompat.h
+++ b/include/ust/kcompat/kcompat.h
@@ -56,7 +56,6 @@
 #include <urcu/arch.h>
 
 /* Kernel libs */
-#include <ust/kcompat/simple.h>
 #include <ust/kcompat/compiler.h>
 #include <ust/kcompat/types.h>
 #include <ust/kcompat/jhash.h>

diff --git a/include/ust/kcompat/simple.h b/include/ust/kcompat/simple.h
deleted file mode 100644 (file)
index 38a9be5..0000000
--- a/include/ust/kcompat/simple.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * simple.h
- *
- * Copyright (C) 2009 - Pierre-Marc Fournier (pierre-marc dot fournier at polymtl dot ca)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-#ifndef KCOMPAT_SIMPLE_H
-#define KCOMPAT_SIMPLE_H
-
-/* libkcompat: from rcupdate.h */
-
-struct rcu_head {
-       struct rcu_head *next;
-       void (*func)(struct rcu_head *head);
-};
-
-#endif /* KCOMPAT_SIMPLE_H */

diff --git a/libust/marker.c b/libust/marker.c
index f9acab6af41ba8a2565a6a9466450eb09160c354..a497f0664b7a5125ad0ebf43425fdb7b8cebe5d8 100644 (file)
--- a/libust/marker.c
+++ b/libust/marker.c
@@ -20,6 +20,7 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <pthread.h>
+#include <urcu-call-rcu.h>
 #include <urcu-bp.h>
 #include <urcu/rculist.h>
 #include <urcu/hlist.h>