From fa62591179a0603a0fcc88f655c731cd7242e658 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Wed, 2 Jun 2021 11:52:59 -0400 Subject: [PATCH] Fix: bump minimal urcu dependency to 0.11 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit cds_lfht_destroy is used from within RCU read-side critical sections which is only allowed for urcu >= 0.10 (see userspace-rcu commit d0ec0ed2f). Such uses were introduced as part of the 2.11 release (contemporary to urcu 0.10). Signed-off-by: Jérémie Galarneau Change-Id: I0b513f58eacd9fc345eacfddcc2662ffa367695a --- README.adoc | 2 +- configure.ac | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.adoc b/README.adoc index 24d85c1ac..e9ff9a812 100644 --- a/README.adoc +++ b/README.adoc @@ -58,7 +58,7 @@ Use `{nbh}{nbh}disable{nbh}epoll` at <> time to build {lt} for an older kernel. However, note that we can't provide any guarantee below 2.6.27. -* **http://www.liburcu.org/[Userspace{nbsp}RCU]{nbsp}≥{nbsp}0.9.0**. +* **http://www.liburcu.org/[Userspace{nbsp}RCU]{nbsp}≥{nbsp}0.11.0**. + Debian/Ubuntu package: `liburcu{nbh}dev`. diff --git a/configure.ac b/configure.ac index c53a978f7..eb0c666bd 100644 --- a/configure.ac +++ b/configure.ac @@ -486,9 +486,9 @@ PKG_CHECK_MODULES([libxml2], [libxml-2.0 >= 2.7.6]) AC_CHECK_FUNC([clock_gettime], [AC_DEFINE_UNQUOTED([LTTNG_HAVE_CLOCK_GETTIME], 1, [Has clock_gettime() support.])]) # URCU library version needed or newer -PKG_CHECK_MODULES([URCU], [liburcu >= 0.9]) -PKG_CHECK_MODULES([URCU_BP], [liburcu-bp >= 0.9]) -PKG_CHECK_MODULES([URCU_CDS], [liburcu-cds >= 0.9]) +PKG_CHECK_MODULES([URCU], [liburcu >= 0.11]) +PKG_CHECK_MODULES([URCU_BP], [liburcu-bp >= 0.11]) +PKG_CHECK_MODULES([URCU_CDS], [liburcu-cds >= 0.11]) AM_CPPFLAGS="$AM_CPPFLAGS $URCU_CFLAGS" # Check for libkmod, it will be auto-neabled if found but won't fail if it's not, -- 2.34.1