use critical_enter/exit to add a critical section around BIOS call,

this unbreaks WITNESS.

Pointed out by: jhb

1 files changed, 9 insertions, 5 deletions

diff --git a/sys/i386/i386/vm86.c b/sys/i386/i386/vm86.c
index 0b79669..3ca104d 100644
--- a/sys/i386/i386/vm86.c
+++ b/sys/i386/i386/vm86.c
@@ -425,7 +425,7 @@ vm86_initialize(void)
 	pcb = &vml->vml_pcb;
 	ext = &vml->vml_ext;
 
-	mtx_init(&vm86_lock, "vm86 lock", NULL, MTX_SPIN);
+	mtx_init(&vm86_lock, "vm86 lock", NULL, MTX_DEF);
 
 	bzero(pcb, sizeof(struct pcb));
 	pcb->new_ptd = vm86pa | PG_V | PG_RW | PG_U;
@@ -578,9 +578,11 @@ vm86_intcall(int intnum, struct vm86frame *vmf)
 		return (EINVAL);
 
 	vmf->vmf_trapno = intnum;
-	mtx_lock_spin(&vm86_lock);
+	mtx_lock(&vm86_lock);
+	critical_enter();
 	retval = vm86_bioscall(vmf);
-	mtx_unlock_spin(&vm86_lock);
+	critical_exit();
+	mtx_unlock(&vm86_lock);
 	return (retval);
 }
 
@@ -600,7 +602,8 @@ vm86_datacall(intnum, vmf, vmc)
 	u_int page;
 	int i, entry, retval;
 
-	mtx_lock_spin(&vm86_lock);
+	mtx_lock(&vm86_lock);
+	critical_enter();
 	for (i = 0; i < vmc->npages; i++) {
 		page = vtophys(vmc->pmap[i].kva & PG_FRAME);
 		entry = vmc->pmap[i].pte_num; 
@@ -617,7 +620,8 @@ vm86_datacall(intnum, vmf, vmc)
 		pte[entry] = vmc->pmap[i].old_pte;
 		pmap_invalidate_page(kernel_pmap, vmc->pmap[i].kva);
 	}
-	mtx_unlock_spin(&vm86_lock);
+	critical_exit();
+	mtx_unlock(&vm86_lock);
 
 	return (retval);
 }