X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=urcu-bp.c;h=67eae07b6e1b3f69c9cc4739d524dd45de899daf;hb=8afbdefc6a045ed243ee186a64254888e381a9bb;hp=bb657d7dc620833d6c7b19cbf0b21e20c3ea78f4;hpb=bd252a04bbbb163aa4d8864b1e1e5a3a4d9d0892;p=urcu.git

diff --git a/urcu-bp.c b/urcu-bp.c
index bb657d7..67eae07 100644
--- a/urcu-bp.c
+++ b/urcu-bp.c
@@ -51,7 +51,14 @@
 #define MAP_ANONYMOUS MAP_ANON
 #endif
 
-#ifndef __linux__
+#ifdef __linux__
+static
+void *mremap_wrapper(void *old_address, size_t old_size,
+		size_t new_size, int flags)
+{
+	return mremap(old_address, old_size, new_size, flags);
+}
+#else
 
 #define MREMAP_MAYMOVE	1
 #define MREMAP_FIXED	2
@@ -60,7 +67,9 @@
  * mremap wrapper for non-Linux systems. Maps a RW, anonymous private mapping.
  * This is not generic.
 */
-void *mremap(void *old_address, size_t old_size, size_t new_size, int flags)
+static
+void *mremap_wrapper(void *old_address, size_t old_size,
+		size_t new_size, int flags)
 {
 	void *new_address;
 
@@ -284,8 +293,8 @@ static void resize_arena(struct registry_arena *arena, size_t len)
 				 MAP_ANONYMOUS | MAP_PRIVATE,
 				 -1, 0);
 	else
-		new_arena = mremap(arena->p, arena->len,
-				   len, MREMAP_MAYMOVE);
+		new_arena = mremap_wrapper(arena->p, arena->len,
+				   	len, MREMAP_MAYMOVE);
 	assert(new_arena != MAP_FAILED);
 
 	/*
@@ -430,7 +439,8 @@ void *rcu_dereference_sym_bp(void *p)
 void *rcu_set_pointer_sym_bp(void **p, void *v)
 {
 	cmm_wmb();
-	return uatomic_set(p, v);
+	uatomic_set(p, v);
+	return v;
 }
 
 void *rcu_xchg_pointer_sym_bp(void **p, void *v)