Rename the mutex thread and process states to use a more generic 'LOCK'

name instead.  (e.g., SLOCK instead of SMTX, TD_ON_LOCK() instead of
TD_ON_MUTEX())  Eventually a turnstile abstraction will be added that
will be shared with mutexes and other types of locks.  SLOCK/TDI_LOCK will
be used internally by the turnstile code and will not be specific to
mutexes.  Making the change now ensures that turnstiles can be dropped
in at a later date without affecting the ABI of userland applications.

1 files changed, 6 insertions, 6 deletions

diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index 81c5c7b..bd613c45 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -927,10 +927,10 @@ fill_kinfo_proc(p, kp)
 				strncpy(kp->ki_wmesg, td->td_wmesg,
 				    sizeof(kp->ki_wmesg) - 1);
 			}
-			if (TD_ON_MUTEX(td)) {
-				kp->ki_kiflag |= KI_MTXBLOCK;
-				strncpy(kp->ki_mtxname, td->td_mtxname,
-				    sizeof(kp->ki_mtxname) - 1);
+			if (TD_ON_LOCK(td)) {
+				kp->ki_kiflag |= KI_LOCKBLOCK;
+				strncpy(kp->ki_lockname, td->td_lockname,
+				    sizeof(kp->ki_lockname) - 1);
 			}
 		}
 
@@ -943,8 +943,8 @@ fill_kinfo_proc(p, kp)
 				kp->ki_stat = SSTOP;
 			} else if (TD_IS_SLEEPING(td)) {
 				kp->ki_stat = SSLEEP;
-			} else if (TD_ON_MUTEX(td)) {
-				kp->ki_stat = SMTX;
+			} else if (TD_ON_LOCK(td)) {
+				kp->ki_stat = SLOCK;
 			} else {
 				kp->ki_stat = SWAIT;
 			}