X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu%2Farch_s390.h;h=bf46d3b56e6b660b0868eade0dec1ccf42a0fa69;hp=1a43c6cff6a22847f288241fed60db77b3fcb933;hb=49617de1d80d771ac9a1d45b1710b16fac65e0aa;hpb=7d413817f09b2d17b1a79ea012590609ffab5eb6

diff --git a/urcu/arch_s390.h b/urcu/arch_s390.h
index 1a43c6c..bf46d3b 100644
--- a/urcu/arch_s390.h
+++ b/urcu/arch_s390.h
@@ -29,7 +29,7 @@
  */
 
 #include <compiler.h>
-#include "config.h"
+#include <config/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()