Module Name: src
Committed By: maya
Date: Mon Sep 11 05:25:53 UTC 2017
Modified Files:
src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.h
Log Message:
Use common barrier.h rather than separate implementation. NFCI
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
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.11 src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.12
--- src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.11 Mon Sep 11 00:58:20 2017
+++ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h Mon Sep 11 05:25:53 2017
@@ -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 @@ typedef off_t loff_t;
#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__ */
