summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDale Rahn <drahn@cvs.openbsd.org>2006-06-01 17:33:48 +0000
committerDale Rahn <drahn@cvs.openbsd.org>2006-06-01 17:33:48 +0000
commitc25f75e9862a9b0a5d8703dcf74a8a179c320d96 (patch)
treed351e527e4294aead80407991491275853042078
parent8210d890ba7ea1fdc9a45fedad61fe17cb7a458c (diff)
Splraise is strictly to increase spl, do not lower.
-rw-r--r--sys/arch/arm/xscale/i80321_intr.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/arch/arm/xscale/i80321_intr.c b/sys/arch/arm/xscale/i80321_intr.c
index c0a8c84ffbd..e64850b34d1 100644
--- a/sys/arch/arm/xscale/i80321_intr.c
+++ b/sys/arch/arm/xscale/i80321_intr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: i80321_intr.c,v 1.3 2006/06/01 08:24:53 drahn Exp $ */
+/* $OpenBSD: i80321_intr.c,v 1.4 2006/06/01 17:33:47 drahn Exp $ */
/* $NetBSD: i80321_icu.c,v 1.11 2005/12/24 20:06:52 perry Exp $ */
/*
@@ -439,7 +439,8 @@ _splraise(int ipl)
int old;
old = current_ipl_level;
- current_ipl_level = ipl;
+ if (ipl > old)
+ current_ipl_level = ipl;
if (spl_debug) {
nesting ++;
if (nesting == 1)