X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=urcu%2Farch_s390.h;h=fc7b3bc2d6b27a979485f1d84a366acc53311820;hb=1655f01899c0f8308d66e9ef59e7036f0233243c;hp=aec91b92c1f6fef6d771e20511a8b5428c0b8e8d;hpb=c96a37267efd57cddf7a30f472f9e56f2ecddddc;p=urcu.git

diff --git a/urcu/arch_s390.h b/urcu/arch_s390.h
index aec91b9..fc7b3bc 100644
--- a/urcu/arch_s390.h
+++ b/urcu/arch_s390.h
@@ -29,7 +29,7 @@
  */
 
 #include <compiler.h>
-#include <config/config.h>
+#include <urcu/config.h>
 
 #define CONFIG_HAVE_MEM_COHERENCY
 
@@ -44,12 +44,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()