From 9ec81f83d25319ace1ba95af62d51987602fb298 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@dragonflybsd.org>
Date: Thu, 16 Jun 2005 17:55:58 +0000
Subject: [PATCH] spl->critical section conversion.

---
 sys/emulation/43bsd/43bsd_signal.c | 11 ++++++-----
 sys/kern/kern_shutdown.c           |  5 +++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/sys/emulation/43bsd/43bsd_signal.c b/sys/emulation/43bsd/43bsd_signal.c
index b662084dd9..84612a0d7a 100644
--- a/sys/emulation/43bsd/43bsd_signal.c
+++ b/sys/emulation/43bsd/43bsd_signal.c
@@ -37,7 +37,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $DragonFly: src/sys/emulation/43bsd/43bsd_signal.c,v 1.1 2003/10/24 14:10:45 daver Exp $
+ * $DragonFly: src/sys/emulation/43bsd/43bsd_signal.c,v 1.2 2005/06/16 17:55:58 dillon Exp $
  * 	from: DragonFly kern/kern_sig.c,v 1.22
  *
  * These syscalls used to live in kern/kern_sig.c.  They are modified
@@ -55,6 +55,7 @@
 #include <sys/proc.h>
 #include <sys/signal.h>
 #include <sys/signalvar.h>
+#include <sys/thread2.h>
 
 #define	ONSIG	32		/* NSIG for osig* syscalls.  XXX. */
 
@@ -117,10 +118,10 @@ osigblock(struct osigblock_args *uap)
 
 	OSIG2SIG(uap->mask, set);
 	SIG_CANTMASK(set);
-	(void) splhigh();
+	crit_enter();
 	SIG2OSIG(p->p_sigmask, uap->sysmsg_result);
 	SIGSETOR(p->p_sigmask, set);
-	(void) spl0();
+	crit_exit();
 	return (0);
 }
 
@@ -132,10 +133,10 @@ osigsetmask(struct osigsetmask_args *uap)
 
 	OSIG2SIG(uap->mask, set);
 	SIG_CANTMASK(set);
-	(void) splhigh();
+	crit_enter();
 	SIG2OSIG(p->p_sigmask, uap->sysmsg_result);
 	SIGSETLO(p->p_sigmask, set);
-	(void) spl0();
+	crit_exit();
 	return (0);
 }
 
diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c
index 06cdd7fe2c..283b678103 100644
--- a/sys/kern/kern_shutdown.c
+++ b/sys/kern/kern_shutdown.c
@@ -37,7 +37,7 @@
  *
  *	@(#)kern_shutdown.c	8.3 (Berkeley) 1/21/94
  * $FreeBSD: src/sys/kern/kern_shutdown.c,v 1.72.2.12 2002/02/21 19:15:10 dillon Exp $
- * $DragonFly: src/sys/kern/kern_shutdown.c,v 1.19 2005/04/19 17:54:42 dillon Exp $
+ * $DragonFly: src/sys/kern/kern_shutdown.c,v 1.20 2005/06/16 17:55:06 dillon Exp $
  */
 
 #include "opt_ddb.h"
@@ -64,6 +64,7 @@
 #include <sys/sysproto.h>
 #include <sys/device.h>
 #include <sys/cons.h>
+#include <sys/thread2.h>
 #include <sys/buf2.h>
 
 #include <machine/pcb.h>
@@ -335,7 +336,7 @@ boot(int howto)
 	 * been completed.
 	 */
 	EVENTHANDLER_INVOKE(shutdown_post_sync, howto);
-	splhigh();
+	crit_enter();
 	if ((howto & (RB_HALT|RB_DUMP)) == RB_DUMP && !cold)
 		dumpsys();
 
-- 
2.41.0