Module Name: src
Committed By: skrll
Date: Thu Jan 12 05:25:03 UTC 2017
Modified Files:
src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.h
Log Message:
Sync memory barriers with sys/external/bsd/drm2/include/asm/barrier.h
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h
diff -u src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.9 src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.10
--- src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.9 Sat Oct 25 11:35:15 2014
+++ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h Thu Jan 12 05:25:03 2017
@@ -327,13 +327,20 @@ typedef off_t loff_t;
#define BCM2835_MBOX_CHAN_VCHIQ 3
#define bcm_mbox_write bcmmbox_write
-#define rmb membar_consumer
-#define wmb membar_producer
+#define mb membar_sync
+#define wmb membar_producer
+#define rmb membar_consumer
#define dsb membar_producer
-#define smp_mb membar_producer
-#define smp_rmb membar_consumer
-#define smp_wmb membar_producer
+#ifdef MULTIPROCESSOR
+# define smp_mb mb
+# define smp_wmb wmb
+# define smp_rmb rmb
+#else
+# define smp_mb() do {} while (0)
+# define smp_wmb() do {} while (0)
+# define smp_rmb() do {} while (0)
+#endif
#define device_print_prettyname(dev) device_printf((dev), "")
