X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=tests%2Fapi_gcc.h;h=b23110d7594325a70a2f2bffb2591112a2f0aa9e;hb=5481ddb381061bda64aebc039900d21cac6a6caf;hp=17487d5c701e81b66349b798b7f7fade5b1d8a96;hpb=d8540fc53386cd7ff270085aca621e32772832ba;p=urcu.git

diff --git a/tests/api_gcc.h b/tests/api_gcc.h
index 17487d5..b23110d 100644
--- a/tests/api_gcc.h
+++ b/tests/api_gcc.h
@@ -251,10 +251,10 @@ cmpxchg(volatile long *ptr, long oldval, long newval)
 #define atomic_dec_return(v)  (atomic_sub_return(1,v))
 
 /* Atomic operations are already serializing on x86 */
-#define smp_mb__before_atomic_dec()	barrier()
-#define smp_mb__after_atomic_dec()	barrier()
-#define smp_mb__before_atomic_inc()	barrier()
-#define smp_mb__after_atomic_inc()	barrier()
+#define smp_mb__before_atomic_dec()	cmm_barrier()
+#define smp_mb__after_atomic_dec()	cmm_barrier()
+#define smp_mb__before_atomic_inc()	cmm_barrier()
+#define smp_mb__after_atomic_inc()	cmm_barrier()
 
 #endif //0 /* duplicate with arch_atomic.h */
 
@@ -291,13 +291,6 @@ cmpxchg(volatile long *ptr, long oldval, long newval)
 #include <sys/param.h>
 /* #include "atomic.h" */
 
-/*
- * Compiler magic.
- */
-#define container_of(ptr, type, member) ({			\
-	const typeof( ((type *)0)->member ) *__mptr = (ptr);	\
-	(type *)( (char *)__mptr - offsetof(type,member) );})
-
 /*
  * Default machine parameters.
  */
@@ -652,10 +645,6 @@ static void smp_init(void)
 #define LIST_POISON1  ((void *) 0x00100100)
 #define LIST_POISON2  ((void *) 0x00200200)
 
-#define container_of(ptr, type, member) ({			\
-	const typeof( ((type *)0)->member ) *__mptr = (ptr);	\
-	(type *)( (char *)__mptr - offsetof(type,member) );})
-
 #if 0
 /*
  * Simple doubly linked list implementation.