Module Name: src
Committed By: matt
Date: Sat Jun 6 22:23:31 UTC 2015
Modified Files:
src/sys/arch/evbmips/cavium: autoconf.c
Log Message:
Add an assert to verify interrupts are enabled.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbmips/cavium/autoconf.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/cavium/autoconf.c
diff -u src/sys/arch/evbmips/cavium/autoconf.c:1.2 src/sys/arch/evbmips/cavium/autoconf.c:1.3
--- src/sys/arch/evbmips/cavium/autoconf.c:1.2 Tue May 19 00:09:02 2015
+++ src/sys/arch/evbmips/cavium/autoconf.c Sat Jun 6 22:23:31 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.2 2015/05/19 00:09:02 matt Exp $ */
+/* $NetBSD: autoconf.c,v 1.3 2015/06/06 22:23:31 matt Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.2 2015/05/19 00:09:02 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.3 2015/06/06 22:23:31 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -46,7 +46,8 @@ __KERNEL_RCSID(0, "$NetBSD: autoconf.c,v
#include <net/if_ether.h>
-#include <machine/cpu.h>
+#include <mips/cpu.h>
+#include <mips/locore.h>
#include <evbmips/cavium/octeon_uboot.h>
@@ -65,6 +66,7 @@ cpu_configure(void)
/* XXX need this? */
(void)spl0();
+ KDASSERT(mips_cp0_status_read() & MIPS_SR_INT_IE);
}
void
