X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=urcu%2Farch_s390.h;h=1f03c784cb32bcc3da7c4c724b5fc7eaf632c501;hb=f7a3d9d917966b0acb45399a66d42dd7e7acb0ca;hp=92341a07e2edbec9f49d550fb4aa295761e04ac6;hpb=02be55611d3b1c7bf4fdfcb3a9c98f621882d417;p=urcu.git

diff --git a/urcu/arch_s390.h b/urcu/arch_s390.h
index 92341a0..1f03c78 100644
--- a/urcu/arch_s390.h
+++ b/urcu/arch_s390.h
@@ -28,68 +28,20 @@
  * IN THE SOFTWARE.
  */
 
-#include <compiler.h>
+#include <urcu/compiler.h>
 #include <urcu/config.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif 
 
-#define CONFIG_HAVE_MEM_COHERENCY
+#define CAA_CACHE_LINE_SIZE	128
 
-#define CACHE_LINE_SIZE	128
-
-#ifndef __SIZEOF_LONG__
-#ifdef __s390x__
-#define __SIZEOF_LONG__ 8
-#else
-#define __SIZEOF_LONG__ 4
-#endif
-#endif
-
-#ifndef BITS_PER_LONG
-#define BITS_PER_LONG	(__SIZEOF_LONG__ * 8)
-#endif
-
-#define mb()    __asm__ __volatile__("bcr 15,0" : : : "memory")
-#define rmb()   __asm__ __volatile__("bcr 15,0" : : : "memory")
-#define wmb()   __asm__ __volatile__("bcr 15,0" : : : "memory")
-#define mc()	barrier()
-#define rmc()	barrier()
-#define wmc()	barrier()
-
-#ifdef CONFIG_RCU_SMP
-#define smp_mb()	mb()
-#define smp_rmb()	rmb()
-#define smp_wmb()	wmb()
-#define smp_mc()	mc()
-#define smp_rmc()	rmc()
-#define smp_wmc()	wmc()
-#else
-#define smp_mb()	barrier()
-#define smp_rmb()	barrier()
-#define smp_wmb()	barrier()
-#define smp_mc()	barrier()
-#define smp_rmc()	barrier()
-#define smp_wmc()	barrier()
-#endif
-
-/* Nop everywhere except on alpha. */
-#define smp_read_barrier_depends()
-
-static inline void cpu_relax(void)
-{
-	barrier();
-}
-
-static inline void sync_core()
-{
-	__asm__ __volatile__("bcr 15,0" : : : "memory");
-}
+#define cmm_mb()    __asm__ __volatile__("bcr 15,0" : : : "memory")
 
 typedef unsigned long long cycles_t;
 
-static inline cycles_t get_cycles (void)
+static inline cycles_t caa_get_cycles (void)
 {
 	cycles_t cycles;
 
@@ -102,4 +54,6 @@ static inline cycles_t get_cycles (void)
 }
 #endif
 
+#include <urcu/arch_generic.h>
+
 #endif /* _URCU_ARCH_S390_H */