Module Name: src
Committed By: riz
Date: Mon May 7 03:06:16 UTC 2012
Modified Files:
src/sys/arch/sparc/sparc [netbsd-6]: intr.c
Log Message:
Pull up following revision(s) (requested by mrg in ticket #206):
sys/arch/sparc/sparc/intr.c: revision 1.116
don't bother whining about bogusintr on zs.
To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.115.10.1 src/sys/arch/sparc/sparc/intr.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/sparc/sparc/intr.c
diff -u src/sys/arch/sparc/sparc/intr.c:1.115 src/sys/arch/sparc/sparc/intr.c:1.115.10.1
--- src/sys/arch/sparc/sparc/intr.c:1.115 Mon May 23 18:40:30 2011
+++ src/sys/arch/sparc/sparc/intr.c Mon May 7 03:06:16 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.115 2011/05/23 18:40:30 rmind Exp $ */
+/* $NetBSD: intr.c,v 1.115.10.1 2012/05/07 03:06:16 riz Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.115 2011/05/23 18:40:30 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.115.10.1 2012/05/07 03:06:16 riz Exp $");
#include "opt_multiprocessor.h"
#include "opt_sparc_arch.h"
@@ -131,6 +131,14 @@ bogusintr(struct clockframe *fp)
{
char bits[64];
+#if defined(MULTIPROCESSOR)
+ /*
+ * XXX as above.
+ */
+ if (fp->ipl == ZS_INTR_IPL)
+ return;
+#endif
+
snprintb(bits, sizeof(bits), PSR_BITS, fp->psr);
printf("cpu%d: bogus interrupt ipl 0x%x pc=0x%x npc=0x%x psr=%s\n",
cpu_number(), fp->ipl, fp->pc, fp->npc, bits);
