Module Name: src
Committed By: matt
Date: Sat Jun 6 04:43:42 UTC 2015
Modified Files:
src/sys/arch/mips/mips: mips_softint.c
Log Message:
Add a KDASSERT to make sure interrupts are still enabled.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mips/mips/mips_softint.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_softint.c
diff -u src/sys/arch/mips/mips/mips_softint.c:1.6 src/sys/arch/mips/mips/mips_softint.c:1.7
--- src/sys/arch/mips/mips/mips_softint.c:1.6 Tue Sep 27 01:02:34 2011
+++ src/sys/arch/mips/mips/mips_softint.c Sat Jun 6 04:43:41 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: mips_softint.c,v 1.6 2011/09/27 01:02:34 jym Exp $ */
+/* $NetBSD: mips_softint.c,v 1.7 2015/06/06 04:43:41 matt Exp $ */
/*-
* Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mips_softint.c,v 1.6 2011/09/27 01:02:34 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mips_softint.c,v 1.7 2015/06/06 04:43:41 matt Exp $");
#include <sys/param.h>
#include <sys/cpu.h>
@@ -114,6 +114,7 @@ softint_process(uint32_t ipending)
KASSERT((ipending & MIPS_SOFT_INT_MASK) != 0);
KASSERT((ipending & ~MIPS_SOFT_INT_MASK) == 0);
KASSERT(ci->ci_cpl == IPL_HIGH);
+ KDASSERT(mips_cp0_status_read() & MIPS_SR_INT_IE);
KASSERTMSG(ci->ci_mtx_count == 0,
"%s: cpu%u (%p): ci_mtx_count (%d) != 0",
__func__, cpu_index(ci), ci, ci->ci_mtx_count);
