X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=urcu%2Farch_s390.h;h=4ad3ee8edd39e8c9f7752ebc0d82db4e90722280;hb=e4d1eb09301904b56cdf22e1d6042df4492d57cb;hp=1a43c6cff6a22847f288241fed60db77b3fcb933;hpb=7d413817f09b2d17b1a79ea012590609ffab5eb6;p=urcu.git

diff --git a/urcu/arch_s390.h b/urcu/arch_s390.h
index 1a43c6c..4ad3ee8 100644
--- a/urcu/arch_s390.h
+++ b/urcu/arch_s390.h
@@ -1,5 +1,5 @@
-#ifndef _ARCH_S390_H
-#define _ARCH_S390_H
+#ifndef _URCU_ARCH_S390_H
+#define _URCU_ARCH_S390_H
 
 /*
  * Trivial definitions for the S390 architecture based on information from the
@@ -28,41 +28,28 @@
  * IN THE SOFTWARE.
  */
 
-#include <compiler.h>
-#include "config.h"
+#include <urcu/compiler.h>
+#include <urcu/config.h>
 
-#define CONFIG_HAVE_MEM_COHERENCY
+#ifdef __cplusplus
+extern "C" {
+#endif 
+
+#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()
-
-#define smp_mb()	mb()
-#define smp_rmb()	rmb()
-#define smp_wmb()	wmb()
-#define smp_mc()	mc()
-#define smp_rmc()	rmc()
-#define smp_wmc()	wmc()
-
-/* 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");
-}
 
 typedef unsigned long long cycles_t;
 
@@ -75,4 +62,10 @@ static inline cycles_t get_cycles (void)
 	return cycles;
 }
 
-#endif /* _ARCH_S390_H */
+#ifdef __cplusplus 
+}
+#endif
+
+#include <urcu/arch_generic.h>
+
+#endif /* _URCU_ARCH_S390_H */