X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fapi_gcc.h;h=872c873f9760da2b812c54aa19a2dc4d0c7894f0;hb=1a43bbd8f98d5dcf1404b16ab4dc4bfddd65c3b0;hp=963f842215dd1eb4e95186b99a7059dbf70a9fe1;hpb=3d7be7ca4e2451381a8fc8a00bd6d7dcbf3b678f;p=urcu.git

diff --git a/tests/api_gcc.h b/tests/api_gcc.h
index 963f842..872c873 100644
--- a/tests/api_gcc.h
+++ b/tests/api_gcc.h
@@ -1,3 +1,5 @@
+
+#ifndef _INCLUDE_API_H
 #define _INCLUDE_API_H
 
 /*
@@ -69,12 +71,13 @@
  * Machine parameters.
  */
 
-#define CACHE_LINE_SIZE 64
+/* #define CACHE_LINE_SIZE 64 */
 #define ____cacheline_internodealigned_in_smp \
 	__attribute__((__aligned__(1 << 6)))
 
 #define LOCK_PREFIX "lock ; "
 
+#if 0 /* duplicate with arch_atomic.h */
 /*
  * Atomic data structure, initialization, and access.
  */
@@ -251,6 +254,8 @@ cmpxchg(volatile long *ptr, long oldval, long newval)
 #define smp_mb__before_atomic_inc()	barrier()
 #define smp_mb__after_atomic_inc()	barrier()
 
+#endif //0 /* duplicate with arch_atomic.h */
+
 /*
  * api_pthreads.h: API mapping to pthreads environment.
  *
@@ -282,7 +287,6 @@ cmpxchg(volatile long *ptr, long oldval, long newval)
 #include <pthread.h>
 #include <sched.h>
 #include <sys/param.h>
-#include <arch.h>
 /* #include "atomic.h" */
 
 /*
@@ -297,7 +301,7 @@ cmpxchg(volatile long *ptr, long oldval, long newval)
  */
 
 #ifndef CACHE_LINE_SIZE
-#define CACHE_LINE_SIZE 128
+/* #define CACHE_LINE_SIZE 128 */
 #endif /* #ifndef CACHE_LINE_SIZE */
 
 /*
@@ -638,6 +642,7 @@ static void smp_init(void)
 	const typeof( ((type *)0)->member ) *__mptr = (ptr);	\
 	(type *)( (char *)__mptr - offsetof(type,member) );})
 
+#if 0
 /*
  * Simple doubly linked list implementation.
  *
@@ -1162,6 +1167,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
@@ -1325,3 +1332,5 @@ static inline void hlist_move_list(struct hlist_head *old,
 	     pos = n)
 
 #endif
+
+#endif