diff -ru /cvs/sys_old/kern/kern_mutex.c /usr/src/sys/kern/kern_mutex.c
--- /cvs/sys_old/kern/kern_mutex.c	Sun Feb 11 14:49:01 2001
+++ /usr/src/sys/kern/kern_mutex.c	Sun Feb 11 14:55:03 2001
@@ -310,7 +310,7 @@
 {
 	int rval;
 
-	MPASS(CURPROC != NULL);
+	MPASS(curproc != NULL);
 
 	/*
 	 * _mtx_trylock does not accept MTX_NOSWITCH option.
@@ -318,7 +318,7 @@
 	KASSERT((opts & MTX_NOSWITCH) == 0,
 	    ("mtx_trylock() called with invalid option flag(s) %d", opts));
 
-	rval = _obtain_lock(m, CURTHD);
+	rval = _obtain_lock(m, curproc);
 
 #ifdef WITNESS
 	if (rval && m->mtx_witness != NULL) {
@@ -348,7 +348,7 @@
 void
 _mtx_lock_sleep(struct mtx *m, int opts, const char *file, int line)
 {
-	struct proc *p = CURPROC;
+	struct proc *p = curproc;
 
 	if ((m->mtx_lock & MTX_FLAGMASK) == (uintptr_t)p) {
 		m->mtx_recurse++;
@@ -498,7 +498,7 @@
 		CTR1(KTR_LOCK, "_mtx_lock_spin: %p spinning", m);
 
 	for (;;) {
-		if (_obtain_lock(m, CURPROC))
+		if (_obtain_lock(m, curproc))
 			break;
 
 		while (m->mtx_lock != MTX_UNOWNED) {
@@ -536,7 +536,7 @@
 	struct mtx *m1;
 	int pri;
 
-	p = CURPROC;
+	p = curproc;
 	MPASS4(mtx_owned(m), "mtx_owned(mpp)", file, line);
 
 	if (mtx_recursed(m)) {
@@ -1012,7 +1012,7 @@
 {
 	struct mtx *m1;
 	struct proc *p;
-	p = CURPROC;
+	p = curproc;
 	LIST_FOREACH(m1, &p->p_heldmtx, mtx_held) {
 		if (m1 == m) {
 			LIST_REMOVE(m, mtx_held);
@@ -1097,7 +1097,7 @@
 	if (witness_cold || m->mtx_witness == NULL || panicstr)
 		return;
 	w = m->mtx_witness;
-	p = CURPROC;
+	p = curproc;
 
 	if (flags & MTX_SPIN) {
 		if ((m->mtx_flags & MTX_SPIN) == 0)
@@ -1281,7 +1281,7 @@
 	w->w_line = line;
 	m->mtx_line = line;
 	m->mtx_file = file;
-	p = CURPROC;
+	p = curproc;
 	MPASS(m->mtx_held.le_prev == NULL);
 	LIST_INSERT_HEAD(&p->p_heldmtx, (struct mtx*)m, mtx_held);
 }
@@ -1340,7 +1340,7 @@
 	int n = 0;
 
 	KASSERT(!witness_cold, ("%s: witness_cold\n", __FUNCTION__));
-	p = CURPROC;
+	p = curproc;
 	LIST_FOREACH(m, &p->p_heldmtx, mtx_held) {
 		if (m == mtx)
 			continue;
@@ -1668,7 +1668,7 @@
 DB_SHOW_COMMAND(mutexes, db_witness_list)
 {
 
-	witness_list(CURPROC);
+	witness_list(curproc);
 }
 
 DB_SHOW_COMMAND(witness, db_witness_display)
diff -ru /cvs/sys_old/sys/mutex.h /usr/src/sys/sys/mutex.h
--- /cvs/sys_old/sys/mutex.h	Sun Feb 11 14:49:51 2001
+++ /usr/src/sys/sys/mutex.h	Sun Feb 11 14:56:43 2001
@@ -250,32 +250,32 @@
  * mtx_recursed(m) returns non-zero if the lock `m' is presently recursed.
  */ 
 #define mtx_lock(m) do {						\
-	MPASS(CURPROC != NULL);						\
-	_get_sleep_lock((m), CURTHD, 0);				\
+	MPASS(curproc != NULL);						\
+	_get_sleep_lock((m), curproc, 0);				\
 	CTR5(KTR_LOCK, STR_mtx_lock_slp, (m)->mtx_description, (m),	\
 	    (m)->mtx_recurse, __FILE__,	__LINE__);			\
 	WITNESS_ENTER((m), (m)->mtx_flags, __FILE__, __LINE__);		\
 } while (0)
 
 #define mtx_lock_spin(m) do {						\
-	MPASS(CURPROC != NULL);						\
-	_get_spin_lock((m), CURTHD, 0);					\
+	MPASS(curproc != NULL);						\
+	_get_spin_lock((m), curproc, 0);				\
 	CTR5(KTR_LOCK, STR_mtx_lock_spn, (m)->mtx_description, (m),	\
 	    (m)->mtx_recurse, __FILE__,	__LINE__);			\
 	WITNESS_ENTER((m), (m)->mtx_flags, __FILE__, __LINE__);		\
 } while (0)
 
 #define mtx_unlock(m) do {						\
-	MPASS(CURPROC != NULL);						\
+	MPASS(curproc != NULL);						\
 	WITNESS_EXIT((m), (m)->mtx_flags, __FILE__, __LINE__);		\
 	mtx_assert((m), MA_OWNED);					\
-	_rel_sleep_lock((m), CURTHD, 0);				\
+	_rel_sleep_lock((m), curproc, 0);				\
 	CTR5(KTR_LOCK, STR_mtx_unlock_slp, (m)->mtx_description, (m),	\
 	    (m)->mtx_recurse, __FILE__,	__LINE__);			\
 } while (0)
 
 #define mtx_unlock_spin(m) do {						\
-	MPASS(CURPROC != NULL);						\
+	MPASS(curproc != NULL);						\
 	WITNESS_EXIT((m), (m)->mtx_flags, __FILE__, __LINE__);		\
 	mtx_assert((m), MA_OWNED);					\
 	_rel_spin_lock((m));						\
@@ -284,8 +284,8 @@
 } while (0)
 
 #define mtx_lock_flags(m, opts) do {					\
-	MPASS(CURPROC != NULL);						\
-	_get_sleep_lock((m), CURTHD, (opts));				\
+	MPASS(curproc != NULL);						\
+	_get_sleep_lock((m), curproc, (opts));				\
 	if (((opts) & MTX_QUIET) == 0)					\
 		CTR5(KTR_LOCK, STR_mtx_lock_slp,			\
 		    (m)->mtx_description, (m), (m)->mtx_recurse, 	\
@@ -295,8 +295,8 @@
 } while (0)
 
 #define mtx_lock_spin_flags(m, opts) do {				\
-	MPASS(CURPROC != NULL);						\
-	_get_spin_lock((m), CURTHD, (opts));				\
+	MPASS(curproc != NULL);						\
+	_get_spin_lock((m), curproc, (opts));				\
 	if (((opts) & MTX_QUIET) == 0)					\
 		CTR5(KTR_LOCK, STR_mtx_lock_spn,			\
 		    (m)->mtx_description, (m), (m)->mtx_recurse, 	\
@@ -306,11 +306,11 @@
 } while (0)
 
 #define mtx_unlock_flags(m, opts) do {					\
-	MPASS(CURPROC != NULL);						\
+	MPASS(curproc != NULL);						\
 	WITNESS_EXIT((m), ((m)->mtx_flags | (opts)), __FILE__,		\
 	    __LINE__);							\
 	mtx_assert((m), MA_OWNED);					\
-	_rel_sleep_lock((m), CURTHD, (opts));				\
+	_rel_sleep_lock((m), curproc, (opts));				\
 	if (((opts) & MTX_QUIET) == 0)					\
 		CTR5(KTR_LOCK, STR_mtx_unlock_slp,			\
 		    (m)->mtx_description, (m), (m)->mtx_recurse, 	\
@@ -323,7 +323,7 @@
  * check will be optimized out.
  */
 #define mtx_unlock_spin_flags(m, opts) do {				\
-	MPASS(CURPROC != NULL);						\
+	MPASS(curproc != NULL);						\
 	WITNESS_EXIT((m), ((m)->mtx_flags | (opts)), __FILE__,		\
 	    __LINE__);							\
 	mtx_assert((m), MA_OWNED);					\
@@ -340,7 +340,7 @@
 #define mtx_trylock_flags(m, opts)					\
 	_mtx_trylock((m), (opts), __FILE__, __LINE__)
 
-#define mtx_owned(m)	(((m)->mtx_lock & MTX_FLAGMASK) == (uintptr_t)CURTHD)
+#define mtx_owned(m)	(((m)->mtx_lock & MTX_FLAGMASK) == (uintptr_t)curproc)
 
 #define mtx_recursed(m)	((m)->mtx_recurse != 0)