X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=urcu%2Fstatic%2Furcu.h;h=fc707173dddf05d2c61a5780793e3c3efa045a51;hb=de07ab9691f011d2458be8c1239d62aaa6cb6100;hp=5b9ceecdca5f291dbc2fff96ae7be25113a3750f;hpb=7a3e2ed26a6be1deac2cfde1d062526497d4ae9f;p=userspace-rcu.git

diff --git a/urcu/static/urcu.h b/urcu/static/urcu.h
index 5b9ceec..fc70717 100644
--- a/urcu/static/urcu.h
+++ b/urcu/static/urcu.h
@@ -60,19 +60,13 @@ extern "C" {
 #define RCU_MB
 #endif
 
+/*
+ * The ABI of sys_membarrier changed after its original implementation.
+ * Disable it for now. Use RCU_MB flavor instead.
+ */
 #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
+#undef RCU_MEMBARRIER
+#define RCU_MB
 #endif
 
 /*