[src/trunk]: src/sys/arch/mips/mips Fix inconsistent mips_o32, _mips_o32, and...

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

details:   https://anonhg.NetBSD.org/src/rev/9a9d60ddd958
branches:  trunk
changeset: 934586:9a9d60ddd958
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sun Jun 14 14:02:39 2020 +0000

description:
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 3e265976c7a1 -r 9a9d60ddd958 sys/arch/mips/mips/bus_dma.c
--- a/sys/arch/mips/mips/bus_dma.c      Sun Jun 14 12:58:01 2020 +0000
+++ b/sys/arch/mips/mips/bus_dma.c      Sun Jun 14 14:02:39 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus_dma.c,v 1.40 2020/03/14 18:08:38 ad Exp $  */
+/*     $NetBSD: bus_dma.c,v 1.41 2020/06/14 14:02:39 tsutsui Exp $     */
 
 /*-
  * Copyright (c) 1997, 1998, 2001, 2020 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.40 2020/03/14 18:08:38 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.41 2020/06/14 14:02:39 tsutsui 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