zap old vm

7 files changed, 7 insertions, 81 deletions

diff --git a/sys/dev/ccd.c b/sys/dev/ccd.c
index 78069096bd8..beec21881ae 100644
--- a/sys/dev/ccd.c
+++ b/sys/dev/ccd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ccd.c,v 1.42 2001/05/05 20:56:58 art Exp $	*/
+/*	$OpenBSD: ccd.c,v 1.43 2001/06/27 04:45:56 art Exp $	*/
 /*	$NetBSD: ccd.c,v 1.33 1996/05/05 04:21:14 thorpej Exp $	*/
 
 /*-
@@ -119,9 +119,7 @@
 #include <vm/vm.h>
 #include <vm/vm_kern.h>
 
-#if defined(UVM)
 #include <uvm/uvm_extern.h>
-#endif
 
 #ifdef __GNUC__
 #define INLINE static __inline
@@ -933,13 +931,8 @@ ccdbuffer(cs, bp, bn, addr, bcount, cbpp, old_io)
 			nbp->b_data = addr;
 		else {
 			do {
-#if defined(UVM)
 				nbp->b_data = (caddr_t) uvm_km_valloc(ccdmap,
 							    bp->b_bcount);
-#else
-				nbp->b_data = (caddr_t) kmem_alloc_pageable(
-							 ccdmap, bp->b_bcount);
-#endif
 
 				/*
 				 * XXX Instead of sleeping, we might revert
@@ -1090,11 +1083,7 @@ ccdiodone(vbp)
 			off += cbp->cb_sg[i].cs_sglen;
 		}
 
-#if defined(UVM)
 		uvm_km_free(ccdmap, (vaddr_t)vbp->b_data, count);
-#else
-		kmem_free(ccdmap, (vaddr_t)vbp->b_data, count);
-#endif
 		if (ccd_need_kvm) {
 			ccd_need_kvm = 0;
 			wakeup(ccdmap);
@@ -1309,13 +1298,8 @@ ccdioctl(dev, cmd, data, flag, p)
 		 * XXX doable via a freelist implementation though.
 		 */
 		if (!ccdmap && !(ccd.ccd_flags & CCDF_OLD))
-#if defined(UVM)
 			ccdmap = uvm_km_suballoc(kernel_map, &min, &max,
 			    CCD_CLUSTERS * MAXBSIZE, FALSE, FALSE, NULL);
-#else
-			ccdmap = kmem_suballoc(kernel_map, &min, &max,
-			    CCD_CLUSTERS * MAXBSIZE, FALSE);
-#endif
 
 		/* Attach the disk. */
 		cs->sc_dkdev.dk_name = cs->sc_xname;
diff --git a/sys/dev/ic/bt463.c b/sys/dev/ic/bt463.c
index 2a38c35ccdb..2e9cbb91e85 100644
--- a/sys/dev/ic/bt463.c
+++ b/sys/dev/ic/bt463.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bt463.c,v 1.3 2001/04/21 20:03:54 aaron Exp $ */
+/* $OpenBSD: bt463.c,v 1.4 2001/06/27 04:45:57 art Exp $ */
 /* $NetBSD: bt463.c,v 1.2 2000/06/13 17:21:06 nathanw Exp $ */
 
 /*-
@@ -369,17 +369,10 @@ bt463_set_cmap(rc, cmapp)
 	if ((u_int)cmapp->index >= BT463_NCMAP_ENTRIES ||
 	    ((u_int)cmapp->index + (u_int)cmapp->count) > BT463_NCMAP_ENTRIES)
 		return (EINVAL);
-#if defined(UVM)
 	if (!uvm_useracc(cmapp->red, cmapp->count, B_READ) ||
 	    !uvm_useracc(cmapp->green, cmapp->count, B_READ) ||
 	    !uvm_useracc(cmapp->blue, cmapp->count, B_READ))
 		return (EFAULT);
-#else
-	if (!useracc(cmapp->red, cmapp->count, B_READ) ||
-            !useracc(cmapp->green, cmapp->count, B_READ) ||
-            !useracc(cmapp->blue, cmapp->count, B_READ))
-                return (EFAULT);
-#endif
 
 	s = spltty();
 
@@ -434,17 +427,10 @@ bt463_check_curcmap(rc, cursorp)
 	     (u_int)cursorp->cmap.count) > 2)
 		return (EINVAL);
 	count = cursorp->cmap.count; 
-#if defined(UVM)
 	if (!uvm_useracc(cursorp->cmap.red, count, B_READ) ||
 	    !uvm_useracc(cursorp->cmap.green, count, B_READ) ||
 	    !uvm_useracc(cursorp->cmap.blue, count, B_READ))
 		return (EFAULT);
-#else
-	if (!useracc(cursorp->cmap.red, count, B_READ) ||
-            !useracc(cursorp->cmap.green, count, B_READ) ||
-            !useracc(cursorp->cmap.blue, count, B_READ))
-                return (EFAULT);
-#endif
 	return (0);
 }
 
diff --git a/sys/dev/ic/bt485.c b/sys/dev/ic/bt485.c
index 6f762b3d22b..0522246f238 100644
--- a/sys/dev/ic/bt485.c
+++ b/sys/dev/ic/bt485.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bt485.c,v 1.5 2001/04/21 20:03:54 aaron Exp $ */
+/* $OpenBSD: bt485.c,v 1.6 2001/06/27 04:45:58 art Exp $ */
 /* $NetBSD: bt485.c,v 1.2 2000/04/02 18:55:01 nathanw Exp $ */
 
 /*
@@ -276,17 +276,10 @@ bt485_set_cmap(rc, cmapp)
 	if ((u_int)cmapp->index >= 256 ||
 	    ((u_int)cmapp->index + (u_int)cmapp->count) > 256)
 		return (EINVAL);
-#if defined(UVM)
 	if (!uvm_useracc(cmapp->red, cmapp->count, B_READ) ||
 	    !uvm_useracc(cmapp->green, cmapp->count, B_READ) ||
 	    !uvm_useracc(cmapp->blue, cmapp->count, B_READ))
 		return (EFAULT);
-#else
-	if (!useracc(cmapp->red, cmapp->count, B_READ) ||
-            !useracc(cmapp->green, cmapp->count, B_READ) ||
-            !useracc(cmapp->blue, cmapp->count, B_READ))
-                return (EFAULT);
-#endif
 
 	s = spltty();
 
@@ -352,32 +345,19 @@ bt485_set_cursor(rc, cursorp)
 		     (u_int)cursorp->cmap.count) > 2)
 			return (EINVAL);
 		count = cursorp->cmap.count;
-#if defined(UVM)
 		if (!uvm_useracc(cursorp->cmap.red, count, B_READ) ||
 		    !uvm_useracc(cursorp->cmap.green, count, B_READ) ||
 		    !uvm_useracc(cursorp->cmap.blue, count, B_READ))
 			return (EFAULT);
-#else
-		if (!useracc(cursorp->cmap.red, count, B_READ) ||
-                    !useracc(cursorp->cmap.green, count, B_READ) ||
-                    !useracc(cursorp->cmap.blue, count, B_READ))
-                        return (EFAULT);
-#endif
 	}
 	if (v & WSDISPLAY_CURSOR_DOSHAPE) {
 		if ((u_int)cursorp->size.x > CURSOR_MAX_SIZE ||
 		    (u_int)cursorp->size.y > CURSOR_MAX_SIZE)
 			return (EINVAL);
 		count = (CURSOR_MAX_SIZE / NBBY) * data->cursize.y;
-#if defined(UVM)
 		if (!uvm_useracc(cursorp->image, count, B_READ) ||
 		    !uvm_useracc(cursorp->mask, count, B_READ))
 			return (EFAULT);
-#else
-		if (!useracc(cursorp->image, count, B_READ) ||
-                    !useracc(cursorp->mask, count, B_READ))
-                        return (EFAULT);
-#endif
 	}
 
 	if (v & (WSDISPLAY_CURSOR_DOPOS | WSDISPLAY_CURSOR_DOCUR)) {
diff --git a/sys/dev/ic/pdqvar.h b/sys/dev/ic/pdqvar.h
index 6d4b3483325..fe47ff1ee20 100644
--- a/sys/dev/ic/pdqvar.h
+++ b/sys/dev/ic/pdqvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pdqvar.h,v 1.11 1999/02/26 01:44:33 art Exp $	*/
+/*	$OpenBSD: pdqvar.h,v 1.12 2001/06/27 04:45:58 art Exp $	*/
 /*	$NetBSD: pdqvar.h,v 1.11 1996/10/25 21:33:37 cgd Exp $	*/
 
 /*-
@@ -95,13 +95,8 @@ enum _pdq_type_t {
 #define	PDQ_OS_MEMALLOC_CONTIG(n)	vm_page_alloc_contig(n, 0, 0xffffffff, PAGE_SIZE)
 #define	PDQ_OS_MEMFREE_CONTIG(p, n)	kmem_free(kernel_map, (vm_offset_t) p, n)
 #else
-#if defined(UVM)
 #define	PDQ_OS_MEMALLOC_CONTIG(n)	uvm_km_alloc(kernel_map, round_page(n))
 #define	PDQ_OS_MEMFREE_CONTIG(p, n)	uvm_km_free(kernel_map, (vaddr_t) p, n)
-#else
-#define	PDQ_OS_MEMALLOC_CONTIG(n)	kmem_alloc(kernel_map, round_page(n))
-#define	PDQ_OS_MEMFREE_CONTIG(p, n)	kmem_free(kernel_map, (vm_offset_t) p, n)
-#endif
 #endif /* __FreeBSD__ */
 
 #if defined(__FreeBSD__)
diff --git a/sys/dev/isa/aha.c b/sys/dev/isa/aha.c
index 784051a1cb7..cec6d74a07a 100644
--- a/sys/dev/isa/aha.c
+++ b/sys/dev/isa/aha.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aha.c,v 1.38 2001/04/02 23:12:50 niklas Exp $	*/
+/*	$OpenBSD: aha.c,v 1.39 2001/06/27 04:45:58 art Exp $	*/
 /*	$NetBSD: aha.c,v 1.11 1996/05/12 23:51:23 mycroft Exp $	*/
 
 #undef AHADIAG
@@ -1083,13 +1083,8 @@ aha_init(sc)
 	 */
 
 	/* XXX KLUDGE!  Should use bus_dmamem_alloc when busified.  */
-#ifdef UVM
 	wmbx = (struct aha_mbx *)uvm_pagealloc_contig(sizeof(struct aha_mbx),
 	    0, 0xffffff, PAGE_SIZE);
-#else
-	wmbx = (struct aha_mbx *)vm_page_alloc_contig(sizeof(struct aha_mbx),
-	    0, 0xffffff, PAGE_SIZE);
-#endif
 	if (wmbx == NULL)
 		panic("aha_init: could not allocate mailbox");
 
diff --git a/sys/dev/ramdisk.c b/sys/dev/ramdisk.c
index 43ee642e441..1ee08d90b47 100644
--- a/sys/dev/ramdisk.c
+++ b/sys/dev/ramdisk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ramdisk.c,v 1.12 2001/05/16 12:51:48 ho Exp $	*/
+/*	$OpenBSD: ramdisk.c,v 1.13 2001/06/27 04:45:57 art Exp $	*/
 /*	$NetBSD: ramdisk.c,v 1.8 1996/04/12 08:30:09 leo Exp $	*/
 
 /*
@@ -62,9 +62,7 @@
 #include <vm/vm.h>
 #include <vm/vm_kern.h>
 
-#if defined(UVM)
 #include <uvm/uvm_extern.h>
-#endif
 
 #include <dev/ramdisk.h>
 
@@ -542,11 +540,7 @@ rd_ioctl_kalloc(sc, urd, proc)
 
 	/* Sanity check the size. */
 	size = urd->rd_size;
-#if defined(UVM)
 	addr = uvm_km_zalloc(kernel_map, size);
-#else
-	addr = kmem_alloc(kernel_map, size);
-#endif
 	if (!addr)
 		return ENOMEM;
 
diff --git a/sys/dev/tc/if_le_ioasic.c b/sys/dev/tc/if_le_ioasic.c
index 6940925fe52..9bc5f56deb8 100644
--- a/sys/dev/tc/if_le_ioasic.c
+++ b/sys/dev/tc/if_le_ioasic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_le_ioasic.c,v 1.5 2000/11/08 14:39:42 art Exp $	*/
+/*	$OpenBSD: if_le_ioasic.c,v 1.6 2001/06/27 04:45:59 art Exp $	*/
 /*	$NetBSD: if_le_ioasic.c,v 1.2 1996/05/07 02:24:56 thorpej Exp $	*/
 
 /*
@@ -43,9 +43,7 @@
 #include <net/if_media.h>
 
 #include <vm/vm.h>
-#ifdef UVM
 #include <uvm/uvm_extern.h>
-#endif
 
 #ifdef INET
 #include <netinet/in.h>
@@ -102,15 +100,9 @@ le_ioasic_attach(parent, self, aux)
 	struct ioasicdev_attach_args *d = aux;
 	register struct le_softc *lesc = (void *)self;
 	register struct am7990_softc *sc = &lesc->sc_am7990;
-#ifdef UVM
 	caddr_t le_iomem;
-#else
-	extern caddr_t le_iomem;
-#endif
 
-#ifdef UVM
 	le_iomem = (caddr_t)uvm_pagealloc_contig(LE_IOASIC_MEMSIZE, 0, 0, LE_IOASIC_MEMALIGN);
-#endif
 
 	lesc->sc_r1 = (struct lereg1 *)
 		TC_DENSE_TO_SPARSE(TC_PHYS_TO_UNCACHED(d->iada_addr));