Use KERNEL_ASSERT_UNLOCKED() instead of KASSERT(!_kernel_lock_held()).
authormvs <mvs@openbsd.org>
Mon, 30 Oct 2023 12:50:59 +0000 (12:50 +0000)
committermvs <mvs@openbsd.org>
Mon, 30 Oct 2023 12:50:59 +0000 (12:50 +0000)
The first one defined as the second, so no functional changed.

ok claudio

sys/arch/amd64/amd64/ipifuncs.c
sys/arch/i386/i386/ipifuncs.c

index 277d727..5c330d7 100644 (file)
@@ -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();
index 17a00c2..81a03ae 100644 (file)
@@ -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();