aboutsummaryrefslogtreecommitdiff
path: root/sys/kern/subr_lock.c
diff options
context:
space:
mode:
authorKip Macy <kmacy@FreeBSD.org>2006-11-13 05:41:46 +0000
committerKip Macy <kmacy@FreeBSD.org>2006-11-13 05:41:46 +0000
commit61bd5e21b3b5311e0fd3bc37ff730b5f17f1c924 (patch)
treefaa5c9764e0735ad055fed3a6440173e14455120 /sys/kern/subr_lock.c
parent430e6e77f090d8673277249d5e27df67e5fb9b61 (diff)
downloadsrc-61bd5e21b3b5311e0fd3bc37ff730b5f17f1c924.tar.gz
src-61bd5e21b3b5311e0fd3bc37ff730b5f17f1c924.zip
track lock class name in a way that doesn't break WITNESS
Notes
Notes: svn path=/head/; revision=164246
Diffstat (limited to 'sys/kern/subr_lock.c')
-rw-r--r--sys/kern/subr_lock.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/kern/subr_lock.c b/sys/kern/subr_lock.c
index 94e7d8819a33..adf5e594ba1a 100644
--- a/sys/kern/subr_lock.c
+++ b/sys/kern/subr_lock.c
@@ -58,6 +58,7 @@ struct lock_class *lock_classes[LOCK_CLASS_MAX + 1] = {
&lock_class_mtx_sleep,
&lock_class_sx,
&lock_class_rw,
+ &lock_class_lockmgr,
};
#ifdef LOCK_PROFILING
@@ -305,9 +306,9 @@ void _lock_profile_update_wait(struct lock_object *lo, uint64_t waitstart)
}
mpp->file = p;
mpp->line = l->lpo_lineno;
- mpp->name = lo->lo_name;
- mpp->type = lo->lo_type;
mpp->namehash = l->lpo_namehash;
+ mpp->type = l->lpo_type;
+ mpp->name = lo->lo_name;
if (collision)
++lock_prof_collisions;
/* We might have raced someone else but who cares, they'll try again next time */
@@ -368,7 +369,7 @@ void _lock_profile_release_lock(struct lock_object *lo)
mpp->file = p;
mpp->line = l->lpo_lineno;
mpp->namehash = l->lpo_namehash;
- mpp->type = lo->lo_type;
+ mpp->type = l->lpo_type;
mpp->name = lo->lo_name;
if (collision)