From 730c53dc7daf938d99745ea8970e038e1a47f096 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Wed, 8 Jun 2011 20:42:46 -0400 Subject: [PATCH] Update following liburcu changes Addition of call_rcu in liburcu deprecates the simple.h kcompat header. Signed-off-by: Mathieu Desnoyers --- README | 2 +- include/Makefile.am | 1 - include/ust/kcompat/kcompat.h | 1 - include/ust/kcompat/simple.h | 31 ------------------------------- libust/marker.c | 1 + 5 files changed, 2 insertions(+), 34 deletions(-) delete mode 100644 include/ust/kcompat/simple.h diff --git a/README b/README index 2d1d570f..f4a01016 100644 --- 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 eedde64f..bd649b6b 100644 --- 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 79036509..be8d9269 100644 --- a/include/ust/kcompat/kcompat.h +++ b/include/ust/kcompat/kcompat.h @@ -56,7 +56,6 @@ #include /* Kernel libs */ -#include #include #include #include diff --git a/include/ust/kcompat/simple.h b/include/ust/kcompat/simple.h deleted file mode 100644 index 38a9be59..00000000 --- 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 f9acab6a..a497f066 100644 --- a/libust/marker.c +++ b/libust/marker.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include -- 2.34.1