Modify the critical section API as follows:

- The MD functions critical_enter/exit are renamed to start with a cpu_
  prefix.
- MI wrapper functions critical_enter/exit maintain a per-thread nesting
  count and a per-thread critical section saved state set when entering
  a critical section while at nesting level 0 and restored when exiting
  to nesting level 0.  This moves the saved state out of spin mutexes so
  that interlocking spin mutexes works properly.
- Most low-level MD code that used critical_enter/exit now use
  cpu_critical_enter/exit.  MI code such as device drivers and spin
  mutexes use the MI wrappers.  Note that since the MI wrappers store
  the state in the current thread, they do not have any return values or
  arguments.
- mtx_intr_enable() is replaced with a constant CRITICAL_FORK which is
  assigned to curthread->td_savecrit during fork_exit().

Tested on:	i386, alpha

1 files changed, 4 insertions, 4 deletions

diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c
index a899576..6f17f8f 100644
--- a/sys/kern/subr_trap.c
+++ b/sys/kern/subr_trap.c
@@ -141,9 +141,9 @@ ast(framep)
 		panic("Returning to user mode with mutex(s) held");
 #endif
 	mtx_assert(&Giant, MA_NOTOWNED);
-	s = critical_enter();
+	s = cpu_critical_enter();
 	while ((ke->ke_flags & (KEF_ASTPENDING | KEF_NEEDRESCHED)) != 0) {
-		critical_exit(s);
+		cpu_critical_exit(s);
 		td->td_frame = framep;
 		/*
 		 * This updates the p_sflag's for the checks below in one
@@ -195,13 +195,13 @@ ast(framep)
 		crfree(td->td_ucred);
 		mtx_unlock(&Giant);
 		td->td_ucred = NULL;
-		s = critical_enter();
+		s = cpu_critical_enter();
 	}
 	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 critical_exit().
+	 * will perform the equivalent of cpu_critical_exit().
 	 */
 }