X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=tests%2Fapi_ppc.h;h=8359d042b9b9878bdf2432e0da5943a5ec4e880d;hp=8a03faa1c0adf1adee77e525df9b102e14b010b3;hb=6ee91d83a7a5b33160158f57f94dd75e6d0a67ed;hpb=833dbdb633ba44bfb71b4b965a83096d8e4e827b

diff --git a/tests/api_ppc.h b/tests/api_ppc.h
index 8a03faa..8359d04 100644
--- a/tests/api_ppc.h
+++ b/tests/api_ppc.h
@@ -77,6 +77,8 @@
 #define ____cacheline_internodealigned_in_smp \
 	__attribute__((__aligned__(1 << 7)))
 
+#if 0 /* duplicate with arch_atomic.h */
+
 /*
  * Atomic data structure, initialization, and access.
  */
@@ -102,7 +104,6 @@ typedef struct { volatile int counter; } atomic_t;
 #  define ISYNC_ON_SMP
 #endif
 
-
 /*
  * Atomic exchange
  *
@@ -617,6 +618,8 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)
 #define smp_mb__before_atomic_inc()	smp_mb()
 #define smp_mb__after_atomic_inc()	smp_mb()
 
+#endif //0 /* duplicate with arch_atomic.h */
+
 /*
  * api_pthreads.h: API mapping to pthreads environment.
  *
@@ -653,7 +656,6 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)
 /*
  * Compiler magic.
  */
-#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
 #define container_of(ptr, type, member) ({			\
 	const typeof( ((type *)0)->member ) *__mptr = (ptr);	\
 	(type *)( (char *)__mptr - offsetof(type,member) );})
@@ -1005,7 +1007,6 @@ static void smp_init(void)
 #define LIST_POISON1  ((void *) 0x00100100)
 #define LIST_POISON2  ((void *) 0x00200200)
 
-#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
 #define container_of(ptr, type, member) ({			\
 	const typeof( ((type *)0)->member ) *__mptr = (ptr);	\
 	(type *)( (char *)__mptr - offsetof(type,member) );})