[src/netbsd-9]: src/sys/arch/mips/mips Pull up following revision(s) (request...

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

details:   https://anonhg.NetBSD.org/src/rev/dca4a57d5d9d
branches:  netbsd-9
changeset: 963951:dca4a57d5d9d
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Jun 20 16:22:57 2020 +0000

description:
Pull up following revision(s) (requested by tsutsui in ticket #963):

        sys/arch/mips/mips/bus_dma.c: revision 1.41

Fix inconsistent mips_o32, _mips_o32, and __mips_o32 macro.  PR/54216

Not sure what the original intention was, but no responce for a year,
and no visible regression on Cobalt Qube 2700 (Rm5230) through
whole installation using netbsd-9 based Cobalt RestoreCD/USB.

diffstat:

 sys/arch/mips/mips/bus_dma.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 2a990be7d9a9 -r dca4a57d5d9d sys/arch/mips/mips/bus_dma.c
--- a/sys/arch/mips/mips/bus_dma.c      Sat Jun 20 16:19:43 2020 +0000
+++ b/sys/arch/mips/mips/bus_dma.c      Sat Jun 20 16:22:57 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus_dma.c,v 1.38.20.1 2020/03/13 05:35:42 martin Exp $ */
+/*     $NetBSD: bus_dma.c,v 1.38.20.2 2020/06/20 16:22:57 martin Exp $ */
 
 /*-
  * Copyright (c) 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.38.20.1 2020/03/13 05:35:42 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.38.20.2 2020/06/20 16:22:57 martin Exp $");
 
 #define _MIPS_BUS_DMA_PRIVATE
 
@@ -829,7 +829,7 @@
            || (ops & (BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE)) == 0)
                goto bounce_it;
 
-#ifdef _mips_o32
+#ifdef __mips_o32
        /*
         * If the mapping belongs to the kernel, or it belongs
         * to the currently-running process (XXX actually, vmspace),
@@ -871,7 +871,7 @@
                 * If we are forced to use Index ops, it's always a
                 * Write-back,Invalidate, so just do one test.
                 */
-#ifdef mips_o32
+#ifdef __mips_o32
                if (__predict_false(useindex || vaddr == 0)) {
                        mips_dcache_wbinv_range_index(vaddr, minlen);
 #ifdef BUS_DMA_DEBUG