Remove last two abuses of cpu_critical_{enter,exit} in the MI code.

Reviewed by: jake, jhb, rwatson

2 files changed, 8 insertions, 8 deletions

diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c
index ebd807e..6fdb9c3 100644
--- a/sys/kern/subr_trap.c
+++ b/sys/kern/subr_trap.c
@@ -123,7 +123,7 @@ ast(framep)
 	struct proc *p = td->td_proc;
 	struct kse *ke = td->td_kse;
 	u_int prticks, sticks;
-	critical_t s;
+	register_t s;
 	int sflag;
 	int flags;
 #if defined(DEV_NPX) && !defined(SMP)
@@ -137,9 +137,9 @@ ast(framep)
 #endif
 	mtx_assert(&Giant, MA_NOTOWNED);
 	prticks = 0;		/* XXX: Quiet warning. */
-	s = cpu_critical_enter();
+	s = intr_disable();
 	while ((ke->ke_flags & (KEF_ASTPENDING | KEF_NEEDRESCHED)) != 0) {
-		cpu_critical_exit(s);
+		intr_restore(s);
 		td->td_frame = framep;
 		/*
 		 * This updates the p_sflag's for the checks below in one
@@ -190,13 +190,13 @@ ast(framep)
 #ifdef DIAGNOSTIC
 		cred_free_thread(td);
 #endif
-		s = cpu_critical_enter();
+		s = intr_disable();
 	}
 	mtx_assert(&Giant, MA_NOTOWNED);
 	/*
 	 * We need to keep interrupts disabled so that if any further AST's
 	 * come in, the interrupt they come in on will be delayed until we
 	 * finish returning to userland.  We assume that the return to userland
-	 * will perform the equivalent of cpu_critical_exit().
+	 * will perform the equivalent of intr_restore().
 	 */
 }
diff --git a/sys/kern/subr_witness.c b/sys/kern/subr_witness.c
index 0857b8e..9c0005d 100644
--- a/sys/kern/subr_witness.c
+++ b/sys/kern/subr_witness.c
@@ -775,7 +775,7 @@ witness_unlock(struct lock_object *lock, int flags, const char *file, int line)
 	struct lock_instance *instance;
 	struct lock_class *class;
 	struct thread *td;
-	critical_t s;
+	register_t s;
 	int i, j;
 
 	if (witness_cold || witness_dead || lock->lo_witness == NULL ||
@@ -825,7 +825,7 @@ witness_unlock(struct lock_object *lock, int flags, const char *file, int line)
 					instance->li_flags--;
 					return;
 				}
-				s = cpu_critical_enter();
+				s = intr_disable();
 				CTR4(KTR_WITNESS,
 				    "%s: pid %d removed %s from lle[%d]", __func__,
 				    td->td_proc->p_pid,
@@ -835,7 +835,7 @@ witness_unlock(struct lock_object *lock, int flags, const char *file, int line)
 				for (j = i; j < (*lock_list)->ll_count; j++)
 					(*lock_list)->ll_children[j] =
 					    (*lock_list)->ll_children[j + 1];
-				cpu_critical_exit(s);
+				intr_restore(s);
 				if ((*lock_list)->ll_count == 0) {
 					lle = *lock_list;
 					*lock_list = lle->ll_next;