Module Name: src Committed By: maya Date: Mon Sep 11 07:33:45 UTC 2017
Modified Files: src/sys/external/bsd/common/include/asm: barrier.h src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.h Log Message: keep dsb in vchiq code. dsb refers to an arm instruction, so it won't be used on MI code. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/common/include/asm/barrier.h cvs rdiff -u -r1.12 -r1.13 \ 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/common/include/asm/barrier.h diff -u src/sys/external/bsd/common/include/asm/barrier.h:1.2 src/sys/external/bsd/common/include/asm/barrier.h:1.3 --- src/sys/external/bsd/common/include/asm/barrier.h:1.2 Mon Sep 11 05:22:10 2017 +++ src/sys/external/bsd/common/include/asm/barrier.h Mon Sep 11 07:33:45 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: barrier.h,v 1.2 2017/09/11 05:22:10 maya Exp $ */ +/* $NetBSD: barrier.h,v 1.3 2017/09/11 07:33:45 maya Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -41,7 +41,6 @@ #define mb membar_sync #define wmb membar_producer #define rmb membar_consumer -#define dsb membar_producer #ifdef __alpha__ /* XXX As if... */ # define read_barrier_depends membar_sync 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.12 src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.13 --- src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.12 Mon Sep 11 05:25:53 2017 +++ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h Mon Sep 11 07:33:45 2017 @@ -328,6 +328,8 @@ typedef off_t loff_t; #define BCM2835_MBOX_CHAN_VCHIQ 3 #define bcm_mbox_write bcmmbox_write +#define dsb membar_producer + #define device_print_prettyname(dev) device_printf((dev), "") #endif /* __VCHI_NETBSD_H__ */