summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2017-12-04 09:38:21 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2017-12-04 09:38:21 +0000
commit7c011d9e8d8db99faeb35a7df465a3d0da5621ac (patch)
tree8ffc1d3401557c56b0ffc9e303a0abd190051392 /sys/arch
parent4a47765a7f6db87a20fa3857bbf8593bc4dd9a28 (diff)
Use _kernel_lock_held() instead of __mp_lock_held(&kernel_lock).
ok visa@
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/amd64/amd64/ipifuncs.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/amd64/amd64/ipifuncs.c b/sys/arch/amd64/amd64/ipifuncs.c
index 84a625a0e03..c563de2fd4d 100644
--- a/sys/arch/amd64/amd64/ipifuncs.c
+++ b/sys/arch/amd64/amd64/ipifuncs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ipifuncs.c,v 1.28 2015/11/23 22:57:12 deraadt Exp $ */
+/* $OpenBSD: ipifuncs.c,v 1.29 2017/12/04 09:38:20 mpi Exp $ */
/* $NetBSD: ipifuncs.c,v 1.1 2003/04/26 18:39:28 fvdl Exp $ */
/*-
@@ -113,8 +113,8 @@ void
x86_64_ipi_halt(struct cpu_info *ci)
{
SCHED_ASSERT_UNLOCKED();
- KASSERT(!__mp_lock_held(&kernel_lock));
-
+ KASSERT(!_kernel_lock_held());
+
fpusave_cpu(ci, 1);
disable_intr();
lapic_disable();