Nuke kvtop(), preserving a private copy in mvme88k vs(4) for now.

2 files changed, 14 insertions, 14 deletions

diff --git a/sys/arch/mvme88k/dev/vs.c b/sys/arch/mvme88k/dev/vs.c
index f1240f108ac..79370d368c0 100644
--- a/sys/arch/mvme88k/dev/vs.c
+++ b/sys/arch/mvme88k/dev/vs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vs.c,v 1.39 2004/05/22 21:02:38 miod Exp $	*/
+/*	$OpenBSD: vs.c,v 1.40 2004/05/23 20:52:16 miod Exp $	*/
 
 /*
  * Copyright (c) 2004, Miodrag Vallat.
@@ -49,7 +49,7 @@
 #include <sys/buf.h>
 #include <sys/malloc.h>
 
-#include <uvm/uvm_param.h>
+#include <uvm/uvm.h>
 
 #include <scsi/scsi_all.h>
 #include <scsi/scsiconf.h>
@@ -111,6 +111,7 @@ void	vs_scsidone(struct vs_softc *, struct scsi_xfer *, int);
 
 static __inline__ void vs_clear_return_info(struct vs_softc *);
 static __inline__ int vs_queue_number(int, int);
+static __inline__ paddr_t kvtop(vaddr_t);
 
 int
 vsmatch(struct device *device, void *cf, void *args)
@@ -1010,3 +1011,13 @@ vs_build_memory_structure(struct vs_softc *sc, struct scsi_xfer *xs,
 	}
 	return sg;
 }
+
+static paddr_t
+kvtop(vaddr_t va)
+{
+	paddr_t pa;
+
+	pmap_extract(pmap_kernel(), va, &pa);
+	/* XXX check for failure */
+	return pa;
+}
diff --git a/sys/arch/mvme88k/mvme88k/vm_machdep.c b/sys/arch/mvme88k/mvme88k/vm_machdep.c
index 2d056fb4cc0..0b747fef885 100644
--- a/sys/arch/mvme88k/mvme88k/vm_machdep.c
+++ b/sys/arch/mvme88k/mvme88k/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_machdep.c,v 1.61 2004/03/03 22:23:58 miod Exp $	*/
+/*	$OpenBSD: vm_machdep.c,v 1.62 2004/05/23 20:52:16 miod Exp $	*/
 
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
@@ -489,14 +489,3 @@ pagemove(from, to, size)
 	}
 	pmap_update(pmap_kernel());
 }
-
-u_int
-kvtop(va)
-	vaddr_t va;
-{
-	paddr_t pa;
-
-	pmap_extract(pmap_kernel(), va, &pa);
-	/* XXX check for failure */
-	return ((u_int)pa);
-}