From f582857f9bd71447e51d2470e6bc9d5ea7a5bcf5 Mon Sep 17 00:00:00 2001 From: Merlin Scholz Date: Thu, 27 Oct 2022 12:39:35 +0200 Subject: Undo previous log_lock functions only used for testing --- sys/kern/kern_mutex.c | 3 --- sys/kern/kern_rwlock.c | 3 --- 2 files changed, 6 deletions(-) diff --git a/sys/kern/kern_mutex.c b/sys/kern/kern_mutex.c index a550c08c16e..930b033a4e1 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.107 2023/05/01 12:18:08 riastradh E #include #include #include -#include #include @@ -902,7 +901,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); @@ -919,7 +917,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 395fbdcee34..4546a154b97 100644 --- a/sys/kern/kern_rwlock.c +++ b/sys/kern/kern_rwlock.c @@ -62,7 +62,6 @@ __KERNEL_RCSID(0, "$NetBSD: kern_rwlock.c,v 1.70 2023/02/24 11:11:10 riastradh E #include #include #include -#include #include @@ -575,8 +574,6 @@ rw_vector_tryenter(krwlock_t *rw, const krw_t op) (op == RW_READER && RW_COUNT(rw) != 0)); membar_acquire(); - - log_lock(P_WRITE, rw, __FILE__, __LINE__, LOCK_NONE); return 1; } -- cgit