X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=urcu%2Farch_s390.h;h=9d3d452b961b3dd3e74a99147a2b6012688685d0;hb=2041a99a1abff800c4d48fd2e9d0761609bb63a4;hp=aec91b92c1f6fef6d771e20511a8b5428c0b8e8d;hpb=c96a37267efd57cddf7a30f472f9e56f2ecddddc;p=urcu.git

diff --git a/urcu/arch_s390.h b/urcu/arch_s390.h
index aec91b9..9d3d452 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
@@ -29,10 +29,20 @@
  */
 
 #include <compiler.h>
-#include <config/config.h>
+#include <urcu/config.h>
 
 #define CONFIG_HAVE_MEM_COHERENCY
 
+#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
@@ -44,12 +54,21 @@
 #define rmc()	barrier()
 #define wmc()	barrier()
 
+#ifdef CONFIG_URCU_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()
@@ -75,4 +94,4 @@ static inline cycles_t get_cycles (void)
 	return cycles;
 }
 
-#endif /* _ARCH_S390_H */
+#endif /* _URCU_ARCH_S390_H */