Stop touching kernel_lock directly, use the provided macros.

ok pedro@
bitrig · Feb 11, 2015 · fcd46c3 · fcd46c3
1 parent bbda296
commit fcd46c3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/sys/arch/amd64/amd64/intr.c b/sys/arch/amd64/amd64/intr.c
@@ -570,12 +570,12 @@ intr_handler(struct intrframe *frame, struct intrhand *ih)
 		need_lock = frame->if_ppl < IPL_SCHED;
 
 	if (need_lock)
-		__mp_lock(&kernel_lock);
+		KERNEL_LOCK();
 #endif
 	rc = (*ih->ih_fun)(ih->ih_arg ? ih->ih_arg : frame);
 #ifdef MULTIPROCESSOR
 	if (need_lock)
-		__mp_unlock(&kernel_lock);
+		KERNEL_UNLOCK();
 #endif
 	return rc;
 }

diff --git a/sys/arch/amd64/amd64/ipifuncs.c b/sys/arch/amd64/amd64/ipifuncs.c
@@ -97,7 +97,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();

diff --git a/sys/arch/amd64/amd64/softintr.c b/sys/arch/amd64/amd64/softintr.c
@@ -108,9 +108,9 @@ softintr_biglock_wrap(void *arg)
 {
 	struct x86_soft_intrhand	*sih = arg;
 
-	__mp_lock(&kernel_lock);
+	KERNEL_LOCK();
 	sih->sih_fnwrap(sih->sih_argwrap);
-	__mp_unlock(&kernel_lock);
+	KERNEL_UNLOCK();
 }
 #endif