Module Name: src
Committed By: simonb
Date: Wed Jun 10 01:42:17 UTC 2020
Modified Files:
src/sys/arch/mips/mips: mips_machdep.c
Log Message:
Protect using mipsNN_foo() functions with an #ifdef MIPSNN.
Fixes non-MIPSNN kernel compiles pointed out by tsutsui@.
To generate a diff of this commit:
cvs rdiff -u -r1.284 -r1.285 src/sys/arch/mips/mips/mips_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/mips/mips_machdep.c
diff -u src/sys/arch/mips/mips/mips_machdep.c:1.284 src/sys/arch/mips/mips/mips_machdep.c:1.285
--- src/sys/arch/mips/mips/mips_machdep.c:1.284 Tue Jun 9 06:18:01 2020
+++ src/sys/arch/mips/mips/mips_machdep.c Wed Jun 10 01:42:17 2020
@@ -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 @@ cpu_identify(device_t dev)
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 @@ cpu_identify(device_t dev)
break;
}
}
+#endif
if (opts->mips_cpu->cpu_cid != 0) {
if (opts->mips_cpu->cpu_cid <= ncidnames)
