we have wrappers around these now. ok?
Index: arch/amd64/amd64/intr.c
===================================================================
RCS file: /cvs/src/sys/arch/amd64/amd64/intr.c,v
retrieving revision 1.48
diff -u -p -r1.48 intr.c
--- arch/amd64/amd64/intr.c 22 Jun 2016 01:12:38 -0000 1.48
+++ arch/amd64/amd64/intr.c 23 Feb 2017 06:04:37 -0000
@@ -527,7 +527,7 @@ intr_handler(struct intrframe *frame, st
need_lock = frame->if_ppl < IPL_SCHED;
if (need_lock)
- __mp_lock(&kernel_lock);
+ KERNEL_LOCK();
#endif
floor = ci->ci_handled_intr_level;
ci->ci_handled_intr_level = ih->ih_level;
@@ -535,7 +535,7 @@ intr_handler(struct intrframe *frame, st
ci->ci_handled_intr_level = floor;
#ifdef MULTIPROCESSOR
if (need_lock)
- __mp_unlock(&kernel_lock);
+ KERNEL_UNLOCK();
#endif
return rc;
}
Index: arch/amd64/amd64/ipifuncs.c
===================================================================
RCS file: /cvs/src/sys/arch/amd64/amd64/ipifuncs.c,v
retrieving revision 1.28
diff -u -p -r1.28 ipifuncs.c
--- arch/amd64/amd64/ipifuncs.c 23 Nov 2015 22:57:12 -0000 1.28
+++ arch/amd64/amd64/ipifuncs.c 23 Feb 2017 06:04:37 -0000
@@ -113,7 +113,7 @@ void
x86_64_ipi_halt(struct cpu_info *ci)
{
SCHED_ASSERT_UNLOCKED();
- KASSERT(!__mp_lock_held(&kernel_lock));
+ KERNEL_ASSERT_UNLOCKED();
fpusave_cpu(ci, 1);
disable_intr();