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

diff --git a/urcu/arch_s390.h b/urcu/arch_s390.h
index bf46d3b..92341a0 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,22 +29,36 @@
  */
 
 #include <compiler.h>
-#include <config/config.h>
+#include <urcu/config.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif 
 
 #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
 
 #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_URCU_SMP
+#ifdef CONFIG_RCU_SMP
 #define smp_mb()	mb()
 #define smp_rmb()	rmb()
 #define smp_wmb()	wmb()
@@ -84,4 +98,8 @@ static inline cycles_t get_cycles (void)
 	return cycles;
 }
 
-#endif /* _ARCH_S390_H */
+#ifdef __cplusplus 
+}
+#endif
+
+#endif /* _URCU_ARCH_S390_H */