From 562f5264342a48566e48da4aea64542a27eb0c29 Mon Sep 17 00:00:00 2001
From: Taylor R Campbell <riastradh@NetBSD.org>
Date: Sat, 20 Aug 2022 23:32:23 +0000
Subject: [PATCH] KERNEL_LOCK(9): Limit ipi trace diagnostic to after init has
 started.

---
 sys/kern/kern_lock.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/sys/kern/kern_lock.c b/sys/kern/kern_lock.c
index 0242a825873a..ceb5b3a20740 100644
--- a/sys/kern/kern_lock.c
+++ b/sys/kern/kern_lock.c
@@ -253,8 +253,8 @@ _kernel_lock(int nlocks)
 		splx(s);
 		while (__SIMPLELOCK_LOCKED_P(kernel_lock)) {
 #ifdef LOCKDEBUG
-			if (SPINLOCK_SPINOUT(spins)) {
-				extern int start_init_exec;
+			extern int start_init_exec;
+			if (SPINLOCK_SPINOUT(spins) && start_init_exec) {
 				ipi_msg_t msg = {
 					.func = kernel_lock_trace_ipi,
 				};
@@ -262,8 +262,7 @@ _kernel_lock(int nlocks)
 				ipi_unicast(&msg, kernel_lock_holder);
 				ipi_wait(&msg);
 				kpreempt_enable();
-				if (start_init_exec)
-					_KERNEL_LOCK_ABORT("spinout");
+				_KERNEL_LOCK_ABORT("spinout");
 			}
 			SPINLOCK_BACKOFF_HOOK;
 			SPINLOCK_SPIN_HOOK;