X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu%2Farch_s390.h;h=22a1853fb831903ede0575c40e14b87b46b6326b;hp=71717686c77f23589e8664981aa1126a4248896c;hb=14714b51fd19da8d72a3eb3367c2e52615b3baf3;hpb=1ccf9cbe71d7392fb87e4b0046bd2eb94a75b541

diff --git a/urcu/arch_s390.h b/urcu/arch_s390.h
index 7171768..22a1853 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,29 +28,51 @@
  * IN THE SOFTWARE.
  */
 
-#include <compiler.h>
+#include <urcu/compiler.h>
+#include <urcu/config.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif 
 
 #define CONFIG_HAVE_MEM_COHERENCY
-/* Assume SMP machine, given we don't have this information */
-#define CONFIG_SMP 1
+
+#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 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()
@@ -76,4 +98,8 @@ static inline cycles_t get_cycles (void)
 	return cycles;
 }
 
-#endif /* _ARCH_S390_H */
+#ifdef __cplusplus 
+}
+#endif
+
+#endif /* _URCU_ARCH_S390_H */