[src/netbsd-6]: src/sys/arch/sparc/sparc Pull up following revision(s) (reque...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a75772f6061a
branches:  netbsd-6
changeset: 774046:a75772f6061a
user:      riz <riz%NetBSD.org@localhost>
date:      Mon May 07 03:06:16 2012 +0000

description:
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.

diffstat:

 sys/arch/sparc/sparc/intr.c |  12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diffs (33 lines):

diff -r 56de63111fa2 -r a75772f6061a sys/arch/sparc/sparc/intr.c
--- a/sys/arch/sparc/sparc/intr.c       Mon May 07 03:03:18 2012 +0000
+++ b/sys/arch/sparc/sparc/intr.c       Mon May 07 03:06:16 2012 +0000
@@ -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 @@
 {
        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);