Module Name: src
Committed By: andvar
Date: Tue Mar 12 21:27:14 UTC 2024
Modified Files:
src/sys/arch/evbmips/evbmips: interrupt.c
Log Message:
Fix non-DIAGNOSTIC build for evbmips.
mtx_count, biglock_count and blcnt are defined inside DIAGNOSTIC block, thus
KASSERTs using them should be guarded as well.
Seemingly introduced with matt-nb5-mips64 merge in 2011.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/evbmips/evbmips/interrupt.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/evbmips/evbmips/interrupt.c
diff -u src/sys/arch/evbmips/evbmips/interrupt.c:1.25 src/sys/arch/evbmips/evbmips/interrupt.c:1.26
--- src/sys/arch/evbmips/evbmips/interrupt.c:1.25 Sat Jun 10 07:30:57 2023
+++ src/sys/arch/evbmips/evbmips/interrupt.c Tue Mar 12 21:27:14 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: interrupt.c,v 1.25 2023/06/10 07:30:57 skrll Exp $ */
+/* $NetBSD: interrupt.c,v 1.26 2024/03/12 21:27:14 andvar Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.25 2023/06/10 07:30:57 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.26 2024/03/12 21:27:14 andvar Exp $");
#include <sys/param.h>
#include <sys/cpu.h>
@@ -94,9 +94,11 @@ cpu_intr(int ppl, vaddr_t pc, uint32_t s
/* Process I/O and error interrupts. */
evbmips_iointr(ipl, pending, &cf);
}
+#ifdef DIAGNOSTIC
KASSERT(biglock_count == ci->ci_biglock_count);
KASSERT(blcnt == curlwp->l_blcnt);
KASSERT(mtx_count == ci->ci_mtx_count);
+#endif
/*
* If even our spl is higher now (due to interrupting while
