X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=urcu%2Fstatic%2Furcu.h;h=53d2610a6f775651db01f6dec2ab22f1cc9d17ed;hb=553b7eb9da3a223368abdf3f6a5ead35acf8a20b;hp=bde1459f24100467a0fd42f90e82e54dc4e4815e;hpb=ed1b099ef8acd1396dbde7c7150d1a5eb16ce8a6;p=urcu.git

diff --git a/urcu/static/urcu.h b/urcu/static/urcu.h
index bde1459..53d2610 100644
--- a/urcu/static/urcu.h
+++ b/urcu/static/urcu.h
@@ -51,30 +51,6 @@ extern "C" {
 #define RCU_MEMBARRIER
 #endif
 
-/*
- * RCU_MEMBARRIER is only possibly available on Linux. Fallback to RCU_MB
- * otherwise.
- */
-#if !defined(__linux__) && defined(RCU_MEMBARRIER)
-#undef RCU_MEMBARRIER
-#define RCU_MB
-#endif
-
-#ifdef RCU_MEMBARRIER
-#include <syscall.h>
-
-/* If the headers do not support SYS_membarrier, statically use RCU_MB */
-#ifdef SYS_membarrier
-# define MEMBARRIER_EXPEDITED		(1 << 0)
-# define MEMBARRIER_DELAYED		(1 << 1)
-# define MEMBARRIER_QUERY		(1 << 16)
-# define membarrier(...)		syscall(SYS_membarrier, __VA_ARGS__)
-#else
-# undef RCU_MEMBARRIER
-# define RCU_MB
-#endif
-#endif
-
 /*
  * This code section can only be included in LGPL 2.1 compatible source code.
  * See below for the function call wrappers which can be used in code meant to
@@ -213,7 +189,7 @@ static inline void smp_mb_slave(int group)
 #define RCU_GP_CTR_PHASE	(1UL << (sizeof(unsigned long) << 2))
 #define RCU_GP_CTR_NEST_MASK	(RCU_GP_CTR_PHASE - 1)
 
-struct urcu_gp {
+struct rcu_gp {
 	/*
 	 * Global grace period counter.
 	 * Contains the current RCU_GP_CTR_PHASE.
@@ -226,7 +202,7 @@ struct urcu_gp {
 	int32_t futex;
 } __attribute__((aligned(CAA_CACHE_LINE_SIZE)));
 
-extern struct urcu_gp rcu_gp;
+extern struct rcu_gp rcu_gp;
 
 struct rcu_reader {
 	/* Data used by both reader and synchronize_rcu() */