X-Git-Url: http://git.liburcu.org/?p=userspace-rcu.git;a=blobdiff_plain;f=urcu%2Fmap%2Furcu.h;fp=urcu%2Fmap%2Furcu.h;h=3fae95fbdfafa6883b44ad1864cbfd85013321c5;hp=dd7a6914b93f5c2325dae840824b89d1790b2259;hb=de07ab9691f011d2458be8c1239d62aaa6cb6100;hpb=7a3e2ed26a6be1deac2cfde1d062526497d4ae9f

diff --git a/urcu/map/urcu.h b/urcu/map/urcu.h
index dd7a691..3fae95f 100644
--- a/urcu/map/urcu.h
+++ b/urcu/map/urcu.h
@@ -48,19 +48,13 @@
 #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
 
 #ifdef RCU_MEMBARRIER