summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2006-05-07 15:40:17 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2006-05-07 15:40:17 +0000
commit3ce8806e9cf6d2f8b075f7c7c5b562d98fb7c970 (patch)
tree8febe4726df1cee6402dd7bb7803b7d6b173d5e1
parentc2443119bd87909ec0db823db233230a6599167c (diff)
Do not panic on MVME188 if the abort switch is pressed while we are at ipl 7
(fallout from always enabling the abort switch).
-rw-r--r--sys/arch/mvme88k/mvme88k/m188_machdep.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/mvme88k/mvme88k/m188_machdep.c b/sys/arch/mvme88k/mvme88k/m188_machdep.c
index 903702b61c7..1da0c77c8e1 100644
--- a/sys/arch/mvme88k/mvme88k/m188_machdep.c
+++ b/sys/arch/mvme88k/mvme88k/m188_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: m188_machdep.c,v 1.20 2006/05/06 22:17:20 miod Exp $ */
+/* $OpenBSD: m188_machdep.c,v 1.21 2006/05/07 15:40:16 miod Exp $ */
/*
* Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
* Copyright (c) 1996 Nivas Madhur
@@ -401,7 +401,7 @@ m188_ext_int(u_int v, struct trapframe *eframe)
level = safe_level(cur_mask, old_spl);
#ifdef DIAGNOSTIC
- if (old_spl >= level) {
+ if (level != IPL_ABORT && level <= old_spl) {
int i;
printf("safe level %d <= old level %d\n", level, old_spl);