Pass a thread argument into cpu_critical_{enter,exit}() rather than

dereference curthread.  It is called only from critical_{enter,exit}(),
which already dereferences curthread.  This doesn't seem to affect SMP
performance in my benchmarks, but improves MySQL transaction throughput
by about 1% on UP on my Xeon.

Head nodding:	jhb, bmilekic

1 files changed, 6 insertions, 6 deletions

diff --git a/sys/i386/include/critical.h b/sys/i386/include/critical.h
index 8ddc7ef..9826988 100644
--- a/sys/i386/include/critical.h
+++ b/sys/i386/include/critical.h
@@ -59,9 +59,9 @@ void cpu_critical_fork_exit(void);
  *	is non-zero will be deferred.
  */
 static __inline void
-cpu_critical_enter(void)
+cpu_critical_enter(struct thread *td)
 {
-	curthread->td_md.md_savecrit = intr_disable();
+	td->td_md.md_savecrit = intr_disable();
 }
 
 /*
@@ -76,15 +76,15 @@ cpu_critical_enter(void)
  *	code for us, so we do not have to do anything fancy.
  */
 static __inline void
-cpu_critical_exit(void)
+cpu_critical_exit(struct thread *td)
 {
-	intr_restore(curthread->td_md.md_savecrit);
+	intr_restore(td->td_md.md_savecrit);
 }
 
 #else /* !(__GNUC__ || __INTEL_COMPILER) */
 
-void cpu_critical_enter(void);
-void cpu_critical_exit(void);
+void cpu_critical_enter(struct thread *td);
+void cpu_critical_exit(struct thread *td);
 
 #endif        /* __GNUC__ || __INTEL_COMPILER */