Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/mips/mips Protect using mipsNN_foo() functions with...



details:   https://anonhg.NetBSD.org/src/rev/a478b73892da
branches:  trunk
changeset: 934272:a478b73892da
user:      simonb <simonb%NetBSD.org@localhost>
date:      Wed Jun 10 01:42:17 2020 +0000

description:
Protect using mipsNN_foo() functions with an #ifdef MIPSNN.

Fixes non-MIPSNN kernel compiles pointed out by tsutsui@.

diffstat:

 sys/arch/mips/mips/mips_machdep.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (34 lines):

diff -r 1ed266a03324 -r a478b73892da sys/arch/mips/mips/mips_machdep.c
--- a/sys/arch/mips/mips/mips_machdep.c Tue Jun 09 21:57:00 2020 +0000
+++ b/sys/arch/mips/mips/mips_machdep.c Wed Jun 10 01:42:17 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mips_machdep.c,v 1.284 2020/06/09 06:18:01 simonb Exp $        */
+/*     $NetBSD: mips_machdep.c,v 1.285 2020/06/10 01:42:17 simonb Exp $        */
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -111,7 +111,7 @@
  */
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: mips_machdep.c,v 1.284 2020/06/09 06:18:01 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mips_machdep.c,v 1.285 2020/06/10 01:42:17 simonb Exp $");
 
 #define __INTR_PRIVATE
 #include "opt_cputype.h"
@@ -1495,6 +1495,7 @@
                fpuname = "built-in FPU";
        if (MIPS_PRID_IMPL(cpu_id) == MIPS_RC64470)     /* FPU PRid is 0x21 */
                fpuname = "built-in FPU";
+#ifdef MIPSNN
        if (CPUISMIPSNN) {
                uint32_t cfg1;
 
@@ -1511,6 +1512,7 @@
                        break;
                }
        }
+#endif
 
        if (opts->mips_cpu->cpu_cid != 0) {
                if (opts->mips_cpu->cpu_cid <= ncidnames)



Home | Main Index | Thread Index | Old Index