[src/trunk]: src/sys/arch/sparc/sparc fix a typo - we need to check classipl ...

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

details:   https://anonhg.NetBSD.org/src/rev/6ce76e0e2b8a
branches:  trunk
changeset: 750551:6ce76e0e2b8a
user:      macallan <macallan%NetBSD.org@localhost>
date:      Tue Jan 05 21:38:50 2010 +0000

description:
fix a typo - we need to check classipl vs. IPL_VM, not the SBus interrupt
level

diffstat:

 sys/arch/sparc/sparc/intr.c |  15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diffs (44 lines):

diff -r 8a0fae612d5e -r 6ce76e0e2b8a sys/arch/sparc/sparc/intr.c
--- a/sys/arch/sparc/sparc/intr.c       Tue Jan 05 20:49:04 2010 +0000
+++ b/sys/arch/sparc/sparc/intr.c       Tue Jan 05 21:38:50 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intr.c,v 1.107 2010/01/03 23:03:21 mrg Exp $ */
+/*     $NetBSD: intr.c,v 1.108 2010/01/05 21:38:50 macallan Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.107 2010/01/03 23:03:21 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.108 2010/01/05 21:38:50 macallan Exp $");
 
 #include "opt_multiprocessor.h"
 #include "opt_sparc_arch.h"
@@ -640,8 +640,14 @@
 {
        int s = splhigh();
 #ifdef MULTIPROCESSOR
-       bool mpsafe = (level != IPL_VM) || maybe_mpsafe;
+       bool mpsafe;
 #endif /* MULTIPROCESSOR */
+       if (classipl == 0)
+               classipl = level;
+
+#ifdef MULTIPROCESSOR
+       mpsafe = (classipl != IPL_VM) || maybe_mpsafe;
+#endif
 
 #ifdef DIAGNOSTIC
        if (CPU_ISSUN4C) {
@@ -668,9 +674,6 @@
                inst_fasttrap(level, vec);
        }
 
-       if (classipl == 0)
-               classipl = level;
-
        /* A requested IPL cannot exceed its device class level */
        if (classipl < level)
                panic("intr_establish: class lvl (%d) < pil (%d)\n",