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

diff --git a/tests/api_ppc.h b/tests/api_ppc.h
index 8a03faa..c351d4d 100644
--- a/tests/api_ppc.h
+++ b/tests/api_ppc.h
@@ -73,10 +73,12 @@
 
 #define CONFIG_PPC64
 
-#define CACHE_LINE_SIZE 128
+/*#define CACHE_LINE_SIZE 128 */
 #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) );})
@@ -663,7 +665,7 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)
  */
 
 #ifndef CACHE_LINE_SIZE
-#define CACHE_LINE_SIZE 128
+/* #define CACHE_LINE_SIZE 128 */
 #endif /* #ifndef CACHE_LINE_SIZE */
 
 /*
@@ -1005,11 +1007,12 @@ 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) );})
 
+#if 0
+
 /*
  * Simple doubly linked list implementation.
  *
@@ -1534,6 +1537,8 @@ static inline void list_splice_tail_init(struct list_head *list,
 	     &pos->member != (head); 					\
 	     pos = n, n = list_entry(n->member.prev, typeof(*n), member))
 
+#endif //0
+
 /*
  * Double linked lists with a single pointer list head.
  * Mostly useful for hash tables where the two pointer list head is