Module Name: src
Committed By: mrg
Date: Thu Sep 24 02:12:01 UTC 2020
Modified Files:
src/sys/arch/mips/mips: mipsX_subr.S
Log Message:
fix octeon !DDB builds.
To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 src/sys/arch/mips/mips/mipsX_subr.S
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/mipsX_subr.S
diff -u src/sys/arch/mips/mips/mipsX_subr.S:1.109 src/sys/arch/mips/mips/mipsX_subr.S:1.110
--- src/sys/arch/mips/mips/mipsX_subr.S:1.109 Sun Aug 23 10:23:38 2020
+++ src/sys/arch/mips/mips/mipsX_subr.S Thu Sep 24 02:12:01 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mipsX_subr.S,v 1.109 2020/08/23 10:23:38 simonb Exp $ */
+/* $NetBSD: mipsX_subr.S,v 1.110 2020/09/24 02:12:01 mrg Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -115,6 +115,11 @@
*
* @(#)locore.s 8.5 (Berkeley) 1/4/94
*/
+
+#include <mips/asm.h>
+RCSID("$NetBSD: mipsX_subr.S,v 1.110 2020/09/24 02:12:01 mrg Exp $")
+
+#include "cpunode.h" /* for NWDOG */
#include "opt_cputype.h"
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -125,7 +130,6 @@
#include <sys/cdefs.h>
#include <sys/endian.h>
-#include <mips/asm.h>
#include <mips/cpuregs.h>
#if defined(MIPS3)
#include <mips/cache_r4k.h>
@@ -906,7 +910,7 @@ MIPSX(kern_return):
.set at
END(MIPSX(kern_gen_exception))
-#ifdef DDB
+#if NWDOG > 0 || defined(DDB)
/*
* mipsN_kern_nonmaskable_intr
*
@@ -1044,7 +1048,7 @@ NESTED_NOPROFILE(MIPSX(kern_nonmaskable_
nop
.set at
END(MIPSX(kern_nonmaskable_intr))
-#endif /* DDB */
+#endif /* NWDOG > 0 || DDB */
/*
* mipsN_kern_intr
