From f5c2c0e8120dcad288915333f0399b5a1b7aa44c Mon Sep 17 00:00:00 2001
From: mvs <mvs@openbsd.org>
Date: Mon, 30 Oct 2023 12:50:59 +0000
Subject: [PATCH] Use KERNEL_ASSERT_UNLOCKED() instead of
 KASSERT(!_kernel_lock_held()). The first one defined as the second, so no
 functional changed.

ok claudio
---
 sys/arch/amd64/amd64/ipifuncs.c | 4 ++--
 sys/arch/i386/i386/ipifuncs.c   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys/arch/amd64/amd64/ipifuncs.c b/sys/arch/amd64/amd64/ipifuncs.c
index 277d727c75f..5c330d7a139 100644
--- a/sys/arch/amd64/amd64/ipifuncs.c
+++ b/sys/arch/amd64/amd64/ipifuncs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipifuncs.c,v 1.37 2022/08/07 23:56:06 guenther Exp $	*/
+/*	$OpenBSD: ipifuncs.c,v 1.38 2023/10/30 12:50:59 mvs Exp $	*/
 /*	$NetBSD: ipifuncs.c,v 1.1 2003/04/26 18:39:28 fvdl Exp $ */
 
 /*-
@@ -119,7 +119,7 @@ void
 x86_64_ipi_halt(struct cpu_info *ci)
 {
 	SCHED_ASSERT_UNLOCKED();
-	KASSERT(!_kernel_lock_held());
+	KERNEL_ASSERT_UNLOCKED();
 
 	intr_disable();
 	lapic_disable();
diff --git a/sys/arch/i386/i386/ipifuncs.c b/sys/arch/i386/i386/ipifuncs.c
index 17a00c22e8d..81a03ae5fd7 100644
--- a/sys/arch/i386/i386/ipifuncs.c
+++ b/sys/arch/i386/i386/ipifuncs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipifuncs.c,v 1.34 2023/01/30 10:49:05 jsg Exp $	*/
+/*	$OpenBSD: ipifuncs.c,v 1.35 2023/10/30 12:50:59 mvs Exp $	*/
 /* $NetBSD: ipifuncs.c,v 1.1.2.3 2000/06/26 02:04:06 sommerfeld Exp $ */
 
 /*-
@@ -96,7 +96,7 @@ void
 i386_ipi_halt(struct cpu_info *ci)
 {
 	SCHED_ASSERT_UNLOCKED();
-	KASSERT(!_kernel_lock_held());
+	KERNEL_ASSERT_UNLOCKED();
 
 	npxsave_cpu(ci, 1);
 	intr_disable();
-- 
2.20.1