4 files changed, 12 insertions, 12 deletions

diff --git a/sys/compat/linprocfs/linprocfs.c b/sys/compat/linprocfs/linprocfs.c
index 2e23fe7..749d16a 100644
--- a/sys/compat/linprocfs/linprocfs.c
+++ b/sys/compat/linprocfs/linprocfs.c
@@ -454,12 +454,12 @@ linprocfs_doprocstatus(curp, p, pfs, uio)
 
 	sbuf_new(&sb, NULL, 1024, 0);
 	
-	mtx_enter(&sched_lock, MTX_SPIN);
+	mtx_lock_spin(&sched_lock);
 	if (p->p_stat > sizeof state_str / sizeof *state_str)
 		state = state_str[0];
 	else
 		state = state_str[(int)p->p_stat];
-	mtx_exit(&sched_lock, MTX_SPIN);
+	mtx_unlock_spin(&sched_lock);
 
 	PROCTREE_LOCK(PT_SHARED);
 	ppid = p->p_pptr ? p->p_pptr->p_pid : 0;
diff --git a/sys/compat/linprocfs/linprocfs_misc.c b/sys/compat/linprocfs/linprocfs_misc.c
index 2e23fe7..749d16a 100644
--- a/sys/compat/linprocfs/linprocfs_misc.c
+++ b/sys/compat/linprocfs/linprocfs_misc.c
@@ -454,12 +454,12 @@ linprocfs_doprocstatus(curp, p, pfs, uio)
 
 	sbuf_new(&sb, NULL, 1024, 0);
 	
-	mtx_enter(&sched_lock, MTX_SPIN);
+	mtx_lock_spin(&sched_lock);
 	if (p->p_stat > sizeof state_str / sizeof *state_str)
 		state = state_str[0];
 	else
 		state = state_str[(int)p->p_stat];
-	mtx_exit(&sched_lock, MTX_SPIN);
+	mtx_unlock_spin(&sched_lock);
 
 	PROCTREE_LOCK(PT_SHARED);
 	ppid = p->p_pptr ? p->p_pptr->p_pid : 0;
diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c
index 0caff43..822ef8b 100644
--- a/sys/compat/linux/linux_misc.c
+++ b/sys/compat/linux/linux_misc.c
@@ -642,9 +642,9 @@ linux_times(struct proc *p, struct linux_times_args *args)
 #ifdef DEBUG
     printf("Linux-emul(%ld): times(*)\n", (long)p->p_pid);
 #endif
-    mtx_enter(&sched_lock, MTX_SPIN);
+    mtx_lock_spin(&sched_lock);
     calcru(p, &ru.ru_utime, &ru.ru_stime, NULL);
-    mtx_exit(&sched_lock, MTX_SPIN);
+    mtx_unlock_spin(&sched_lock);
 
     tms.tms_utime = CONVTCK(ru.ru_utime);
     tms.tms_stime = CONVTCK(ru.ru_stime);
diff --git a/sys/compat/svr4/svr4_misc.c b/sys/compat/svr4/svr4_misc.c
index b976c2d..680109b 100644
--- a/sys/compat/svr4/svr4_misc.c
+++ b/sys/compat/svr4/svr4_misc.c
@@ -1141,7 +1141,7 @@ svr4_setinfo(p, st, s)
 
 	if (p) {
 		i.si_pid = p->p_pid;
-		mtx_enter(&sched_lock, MTX_SPIN);
+		mtx_lock_spin(&sched_lock);
 		if (p->p_stat == SZOMB) {
 			i.si_stime = p->p_ru->ru_stime.tv_sec;
 			i.si_utime = p->p_ru->ru_utime.tv_sec;
@@ -1150,7 +1150,7 @@ svr4_setinfo(p, st, s)
 			i.si_stime = p->p_stats->p_ru.ru_stime.tv_sec;
 			i.si_utime = p->p_stats->p_ru.ru_utime.tv_sec;
 		}
-		mtx_exit(&sched_lock, MTX_SPIN);
+		mtx_unlock_spin(&sched_lock);
 	}
 
 	if (WIFEXITED(st)) {
@@ -1226,10 +1226,10 @@ loop:
 		}
 		nfound++;
 		PROC_LOCK(q);
-		mtx_enter(&sched_lock, MTX_SPIN);
+		mtx_lock_spin(&sched_lock);
 		if (q->p_stat == SZOMB && 
 		    ((SCARG(uap, options) & (SVR4_WEXITED|SVR4_WTRAPPED)))) {
-			mtx_exit(&sched_lock, MTX_SPIN);
+			mtx_unlock_spin(&sched_lock);
 			PROC_UNLOCK(q);
 			PROCTREE_LOCK(PT_RELEASE);
 			*retval = 0;
@@ -1357,7 +1357,7 @@ loop:
 		if (q->p_stat == SSTOP && (q->p_flag & P_WAITED) == 0 &&
 		    (q->p_flag & P_TRACED ||
 		     (SCARG(uap, options) & (SVR4_WSTOPPED|SVR4_WCONTINUED)))) {
-			mtx_exit(&sched_lock, MTX_SPIN);
+			mtx_unlock_spin(&sched_lock);
 			DPRINTF(("jobcontrol %d\n", q->p_pid));
 		        if (((SCARG(uap, options) & SVR4_WNOWAIT)) == 0)
 				q->p_flag |= P_WAITED;
@@ -1366,7 +1366,7 @@ loop:
 			return svr4_setinfo(q, W_STOPCODE(q->p_xstat),
 					    SCARG(uap, info));
 		}
-		mtx_exit(&sched_lock, MTX_SPIN);
+		mtx_unlock_spin(&sched_lock);
 		PROC_UNLOCK(q);
 	}