diff options
| author | Merlin Scholz <merlin@scholz.ruhr> | 2022-10-27 12:39:35 +0200 |
|---|---|---|
| committer | Merlin Scholz <merlin@scholz.ruhr> | 2022-10-27 12:39:35 +0200 |
| commit | 1a0ba374e3caa89776b4eabafd495d28edf9f8b7 (patch) | |
| tree | dec9984bceedcddeaa8e93016e137572dae844ce | |
| parent | 36b7cd41b7c1b1b36103fd49ab3770a9d6464c5e (diff) | |
Undo previous log_lock functions only used for testing
| -rw-r--r-- | sys/kern/kern_mutex.c | 3 | ||||
| -rw-r--r-- | sys/kern/kern_rwlock.c | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/sys/kern/kern_mutex.c b/sys/kern/kern_mutex.c index beb40f8a368..7fb68cf2d8f 100644 --- a/sys/kern/kern_mutex.c +++ b/sys/kern/kern_mutex.c @@ -56,7 +56,6 @@ __KERNEL_RCSID(0, "$NetBSD: kern_mutex.c,v 1.79.2.1 2020/03/08 11:21:29 martin E #include <sys/types.h> #include <sys/cpu.h> #include <sys/pserialize.h> -#include <sys/lockdoc.h> #include <dev/lockstat.h> @@ -894,7 +893,6 @@ mutex_tryenter(kmutex_t *mtx) if (MUTEX_SPINBIT_LOCK_TRY(mtx)) { MUTEX_WANTLOCK(mtx); MUTEX_LOCKED(mtx); - log_lock(P_WRITE, mtx, __FILE__, __LINE__, LOCK_NONE); return 1; } MUTEX_SPIN_SPLRESTORE(mtx); @@ -911,7 +909,6 @@ mutex_tryenter(kmutex_t *mtx) MUTEX_LOCKED(mtx); MUTEX_DASSERT(mtx, MUTEX_OWNER(mtx->mtx_owner) == curthread); - log_lock(P_WRITE, mtx, __FILE__, __LINE__, LOCK_NONE); return 1; } } diff --git a/sys/kern/kern_rwlock.c b/sys/kern/kern_rwlock.c index cf9924728ea..fbdbcdad870 100644 --- a/sys/kern/kern_rwlock.c +++ b/sys/kern/kern_rwlock.c @@ -53,7 +53,6 @@ __KERNEL_RCSID(0, "$NetBSD: kern_rwlock.c,v 1.54 2019/05/09 05:00:31 ozaki-r Exp #include <sys/atomic.h> #include <sys/lock.h> #include <sys/pserialize.h> -#include <sys/lockdoc.h> #include <dev/lockstat.h> @@ -571,8 +570,6 @@ rw_vector_tryenter(krwlock_t *rw, const krw_t op) RW_DASSERT(rw, (op != RW_READER && RW_OWNER(rw) == curthread) || (op == RW_READER && RW_COUNT(rw) != 0)); - - log_lock(P_WRITE, rw, __FILE__, __LINE__, LOCK_NONE); return 1; } |
