Merge branch 'master' into lfqueue-dev

diff --git a/ChangeLog b/ChangeLog
index 6782b6158944831fbeb44017c597be403b66a8a5..e355ee8a78de56a1c1962e942c7272baada8fb41 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-21 Userspace RCU 0.6.4
+       * uatomic: Fix ARM build errors in uatomic.
+       * urcu tests: hold mutex across use of custom allocator.
+       * Portability fixes to support FreeBSD 8.2.
+
 2011-06-27 Userspace RCU 0.6.3
        * uatomic: Fix i386 compatibility build errors in uatomic.
 

diff --git a/configure.ac b/configure.ac
index e4105c3d88b1d81674f3ff38a4d2fad642cb1783..2c8b2194fbb25be41965c124d084651c9a0329ea 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 
-AC_INIT([userspace-rcu], [0.6.3], [mathieu dot desnoyers at efficios dot com])
+AC_INIT([userspace-rcu], [0.6.4], [mathieu dot desnoyers at efficios dot com])
 
 # Following the numbering scheme proposed by libtool for the library version
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html

diff --git a/urcu-bp.c b/urcu-bp.c
index 39a6cd0e9ab3ffe06f1d96eaeb889f77f692ac89..273acb88cf2d1749e57bb840bc6e78ab414ebf1d 100644 (file)
--- a/urcu-bp.c
+++ b/urcu-bp.c
@@ -295,7 +295,7 @@ static void add_thread(void)
        if (registry_arena.len
            < registry_arena.used + sizeof(struct rcu_reader))
                resize_arena(&registry_arena,
-               max(registry_arena.len << 1, ARENA_INIT_ALLOC));
+               caa_max(registry_arena.len << 1, ARENA_INIT_ALLOC));
        /*
         * Find a free spot.
         */

diff --git a/urcu/compiler.h b/urcu/compiler.h
index 64d12d344a26a1fdca56fd0b1201437241b9967a..54904cc4078ed144f8a25bc4778cea1ef7fd1319 100644 (file)
--- a/urcu/compiler.h
+++ b/urcu/compiler.h
@@ -39,12 +39,12 @@
  */
 #define CMM_ACCESS_ONCE(x)     (*(volatile typeof(x) *)&(x))
 
-#ifndef max
-#define max(a,b) ((a)>(b)?(a):(b))
+#ifndef caa_max
+#define caa_max(a,b) ((a)>(b)?(a):(b))
 #endif
 
-#ifndef min
-#define min(a,b) ((a)<(b)?(a):(b))
+#ifndef caa_min
+#define caa_min(a,b) ((a)<(b)?(a):(b))
 #endif
 
 #if defined(__SIZEOF_LONG__)