Use _kernel_lock_held() instead of __mp_lock_held(&kernel_lock).
authormpi <mpi@openbsd.org>
Mon, 4 Dec 2017 21:12:41 +0000 (21:12 +0000)
committermpi <mpi@openbsd.org>
Mon, 4 Dec 2017 21:12:41 +0000 (21:12 +0000)
Missed in previous, found by deraadt@, ok visa@

sys/arch/i386/i386/ipifuncs.c

index 0cf14bd..8b3e8b3 100644 (file)
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ipifuncs.c,v 1.29 2016/10/21 16:57:53 deraadt Exp $   */
+/*     $OpenBSD: ipifuncs.c,v 1.30 2017/12/04 21:12:41 mpi Exp $       */
 /* $NetBSD: ipifuncs.c,v 1.1.2.3 2000/06/26 02:04:06 sommerfeld Exp $ */
 
 /*-
@@ -113,7 +113,7 @@ void
 i386_ipi_halt(struct cpu_info *ci)
 {
        SCHED_ASSERT_UNLOCKED();
-       KASSERT(!__mp_lock_held(&kernel_lock));
+       KASSERT(!_kernel_lock_held());
 
        npxsave_cpu(ci, 1);
        disable_intr();