From c25f75e9862a9b0a5d8703dcf74a8a179c320d96 Mon Sep 17 00:00:00 2001
From: Dale Rahn <drahn@cvs.openbsd.org>
Date: Thu, 1 Jun 2006 17:33:48 +0000
Subject: Splraise is strictly to increase spl, do not lower.

---
 sys/arch/arm/xscale/i80321_intr.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'sys')

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)
-- 
cgit v1.2.3