From: Duncan Sands Date: Tue, 16 Aug 2011 11:10:01 +0000 (-0400) Subject: Fix choice of default flavour in urcu/map/urcu.h X-Git-Tag: v0.6.5~52^2~7 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=052fdaeea35b4742e398fbadcf3a2ce96e4b868a;p=userspace-rcu.git Fix choice of default flavour in urcu/map/urcu.h Hi, I noticed in the 0.64 release (and git too) that if a flavour is not specified explicitly then RCU_MB is chosen in urcu/map/urcu.h, while the docs say and the Makefile expects RCU_MEMBARRIER. Note that the header file urcu/static/urcu.h has similar logic but uses RCU_MEMBARRIER for the default. Before this patch: $ nm *.a | grep rcu_init 00000000000003c0 T rcu_init_mb 00000000000003c0 T rcu_init_mb 0000000000000000 T rcu_init_sig After this patch: $ nm *.a | grep rcu_init 00000000000003c0 T rcu_init_memb 00000000000003c0 T rcu_init_mb 0000000000000000 T rcu_init_sig Signed-off-by: Mathieu Desnoyers --- diff --git a/urcu/map/urcu.h b/urcu/map/urcu.h index b55e304..5942fad 100644 --- a/urcu/map/urcu.h +++ b/urcu/map/urcu.h @@ -35,7 +35,7 @@ /* Mapping macros to allow multiple flavors in a single binary. */ #if !defined(RCU_MEMBARRIER) && !defined(RCU_SIGNAL) && !defined(RCU_MB) -#define RCU_MB +#define RCU_MEMBARRIER #endif #ifdef RCU_MEMBARRIER