X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;ds=sidebyside;f=urcu%2Fcompiler.h;h=d67e6c5d36922661f7b9e116d9c2b82ea555f6ec;hb=5481ddb381061bda64aebc039900d21cac6a6caf;hp=5b7bb305b2de83b1828171f506d7241d3c692d03;hpb=1b27a7725e853b9f0673a0ed2639b8dc1065f21b;p=urcu.git

diff --git a/urcu/compiler.h b/urcu/compiler.h
index 5b7bb30..d67e6c5 100644
--- a/urcu/compiler.h
+++ b/urcu/compiler.h
@@ -6,7 +6,7 @@
  *
  * Compiler definitions.
  *
- * Copyright (c) 2009 Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
+ * Copyright (c) 2009 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
  * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
@@ -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
@@ -37,7 +37,7 @@
  * use is to mediate communication between process-level code and irq/NMI
  * handlers, all running on the same CPU.
  */
-#define ACCESS_ONCE(x)	(*(volatile typeof(x) *)&x)
+#define ACCESS_ONCE(x)	(*(volatile typeof(x) *)&(x))
 
 #ifndef max
 #define max(a,b) ((a)>(b)?(a):(b))
@@ -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 */