Rename all memory primitives with prefix cmm_

[urcu.git] / urcu / compiler.h

diff --git a/urcu/compiler.h b/urcu/compiler.h
index fcab5ea591e83e21efa471df038b2500efde3ad8..d67e6c5d36922661f7b9e116d9c2b82ea555f6ec 100644 (file)
--- a/urcu/compiler.h
+++ b/urcu/compiler.h
@@ -23,7 +23,7 @@
 #define likely(x)      __builtin_expect(!!(x), 1)
 #define unlikely(x)    __builtin_expect(!!(x), 0)
 
-#define        barrier()       asm volatile("" : : : "memory")
+#define        cmm_barrier()   asm volatile("" : : : "memory")
 
 /*
  * Instruct the compiler to perform only a single access to a variable
@@ -55,4 +55,10 @@
 #define BITS_PER_LONG  32
 #endif
 
+#define container_of(ptr, type, member)                                        \
+       ({                                                              \
+               const typeof(((type *)NULL)->member) * __ptr = (ptr);   \
+               (type *)((char *)__ptr - offsetof(type, member));       \
+       })
+
 #endif /* _URCU_COMPILER_H */