X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fapi_ppc.h;h=9773500d8049ab6a0120f5282b817eceec5da231;hb=5481ddb381061bda64aebc039900d21cac6a6caf;hp=18821e42125b6f97c0f572aa27dba5c400d5b2fb;hpb=1a43bbd8f98d5dcf1404b16ab4dc4bfddd65c3b0;p=urcu.git

diff --git a/tests/api_ppc.h b/tests/api_ppc.h
index 18821e4..9773500 100644
--- a/tests/api_ppc.h
+++ b/tests/api_ppc.h
@@ -616,10 +616,10 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)
 #define atomic_dec_return(v)  (atomic_sub_return(1,v))
 
 /* Atomic operations are already serializing on x86 */
-#define smp_mb__before_atomic_dec()	smp_mb()
-#define smp_mb__after_atomic_dec()	smp_mb()
-#define smp_mb__before_atomic_inc()	smp_mb()
-#define smp_mb__after_atomic_inc()	smp_mb()
+#define smp_mb__before_atomic_dec()	cmm_smp_mb()
+#define smp_mb__after_atomic_dec()	cmm_smp_mb()
+#define smp_mb__before_atomic_inc()	cmm_smp_mb()
+#define smp_mb__after_atomic_inc()	cmm_smp_mb()
 
 #endif //0 /* duplicate with arch_atomic.h */
 
@@ -656,13 +656,6 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)
 #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.
  */
@@ -1010,10 +1003,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
 
 /*