Module Name: src
Committed By: macallan
Date: Tue Jan 5 21:38:50 UTC 2010
Modified Files:
src/sys/arch/sparc/sparc: intr.c
Log Message:
fix a typo - we need to check classipl vs. IPL_VM, not the SBus interrupt
level
To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 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.107 src/sys/arch/sparc/sparc/intr.c:1.108
--- src/sys/arch/sparc/sparc/intr.c:1.107 Sun Jan 3 23:03:21 2010
+++ src/sys/arch/sparc/sparc/intr.c Tue Jan 5 21:38:50 2010
@@ -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",
