splimp -> splvm

ok martin@

2 files changed, 11 insertions, 11 deletions

diff --git a/sys/arch/vax/qbus/uba.c b/sys/arch/vax/qbus/uba.c
index f459348ed14..2e2a37c0d02 100644
--- a/sys/arch/vax/qbus/uba.c
+++ b/sys/arch/vax/qbus/uba.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uba.c,v 1.10 2004/07/07 23:10:46 deraadt Exp $	*/
+/*	$OpenBSD: uba.c,v 1.11 2005/11/24 04:52:26 brad Exp $	*/
 /*	$NetBSD: uba.c,v 1.57 2001/04/26 19:16:07 ragge Exp $	*/
 /*
  * Copyright (c) 1996 Jonathan Stone.
@@ -76,7 +76,7 @@ uba_enqueue(struct uba_unit *uu)
 
 	uh = (void *)((struct device *)(uu->uu_softc))->dv_parent;
 
-	s = splimp();
+	s = splvm();
 	SIMPLEQ_INSERT_TAIL(&uh->uh_resq, uu, uu_resq);
 	splx(s);
 }
@@ -85,7 +85,7 @@ uba_enqueue(struct uba_unit *uu)
  * When a routine that uses resources is finished, the next device
  * in queue for map registers etc is called. If it succeeds to get
  * resources, call next, and next, and next...
- * This routine must be called at splimp.
+ * This routine must be called at splvm.
  */
 void
 uba_done(struct uba_softc *uh)
@@ -193,7 +193,7 @@ ubareset(struct uba_softc *uh)
 	struct uba_reset *ur;
 	int s;
 
-	s = splimp();
+	s = splvm();
 	SIMPLEQ_INIT(&uh->uh_resq);
 	printf("%s: reset", uh->uh_dev.dv_xname);
 	(*uh->uh_ubainit)(uh);
diff --git a/sys/arch/vax/vax/pmap.c b/sys/arch/vax/vax/pmap.c
index 794561ef026..a0a23d3dcff 100644
--- a/sys/arch/vax/vax/pmap.c
+++ b/sys/arch/vax/vax/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.36 2005/06/30 21:53:13 deraadt Exp $ */
+/*	$OpenBSD: pmap.c,v 1.37 2005/11/24 04:52:23 brad Exp $ */
 /*	$NetBSD: pmap.c,v 1.74 1999/11/13 21:32:25 matt Exp $	   */
 /*
  * Copyright (c) 1994, 1998, 1999 Ludd, University of Lule}, Sweden.
@@ -524,7 +524,7 @@ rensa(clp, ptp)
 if (startpmapdebug)
 	printf("rensa: pv %p clp 0x%x ptp %p\n", pv, clp, ptp);
 #endif
-	s = splimp();
+	s = splvm();
 	RECURSESTART;
 	if (pv->pv_pte == ptp) {
 		g = (int *)pv->pv_pte;
@@ -746,7 +746,7 @@ if (startpmapdebug)
 		} else if (pmap != pmap_kernel())
 				pmap->pm_refcnt[index]++; /* New mapping */
 
-		s = splimp();
+		s = splvm();
 		if (pv->pv_pte == 0) {
 			pv->pv_pte = (pt_entry_t *) & patch[i];
 			pv->pv_pmap = pmap;
@@ -1220,7 +1220,7 @@ if(startpmapdebug) printf("pa %lx\n",pa);
 
 	RECURSESTART;
 	if (prot == VM_PROT_NONE) {
-		s = splimp();
+		s = splvm();
 		g = (int *)pv->pv_pte;
 		if (g) {
 			if ((pv->pv_attr & (PG_V|PG_M)) != (PG_V|PG_M))
@@ -1312,7 +1312,7 @@ struct pv_entry *
 get_pventry()
 {
 	struct pv_entry *tmp;
-	int s = splimp();
+	int s = splvm();
 
 	if (pventries == 0)
 		panic("get_pventry");
@@ -1328,7 +1328,7 @@ void
 free_pventry(pv)
 	struct pv_entry *pv;
 {
-	int s = splimp();
+	int s = splvm();
 
 	pv->pv_next = pv_list;
 	pv_list = pv;
@@ -1355,7 +1355,7 @@ more_pventries()
 	for (i = 0; i < count; i++)
 		pv[i].pv_next = &pv[i + 1];
 
-	s = splimp();
+	s = splvm();
 	pv[count - 1].pv_next = pv_list;
 	pv_list = pv;
 	pventries += count;