[src/trunk]: src/sys/external/bsd/vchiq/dist/interface/compat Use common barr...

[maya <maya%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d6897caa1b90
branches:  trunk
changeset: 826535:d6897caa1b90
user:      maya <maya%NetBSD.org@localhost>
date:      Mon Sep 11 05:25:53 2017 +0000

description:
Use common barrier.h rather than separate implementation. NFCI

diffstat:

 sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h |  20 +----------------
 1 files changed, 1 insertions(+), 19 deletions(-)

diffs (44 lines):

diff -r 5e209316966f -r d6897caa1b90 sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h
--- a/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h   Mon Sep 11 05:22:10 2017 +0000
+++ b/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h   Mon Sep 11 05:25:53 2017 +0000
@@ -28,10 +28,6 @@
 #ifndef __VCHI_NETBSD_H__
 #define __VCHI_NETBSD_H__
 
-#ifdef _KERNEL_OPT
-#include "opt_multiprocessor.h"
-#endif
-
 #include <sys/systm.h>
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -49,6 +45,7 @@
 #include <sys/callout.h>
 
 #include <linux/completion.h>
+#include <asm/barrier.h>
 
 /*
  * Copy from/to user API
@@ -331,21 +328,6 @@
 #define BCM2835_MBOX_CHAN_VCHIQ        3
 #define bcm_mbox_write bcmmbox_write
 
-#define mb      membar_sync
-#define wmb     membar_producer
-#define rmb     membar_consumer
-#define dsb    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), "")
 
 #endif /* __VCHI_NETBSD_H__ */