no more old VM

1 files changed, 1 insertions, 13 deletions

diff --git a/sys/arch/hp300/dev/grf.c b/sys/arch/hp300/dev/grf.c
index 1f934a423c0..dd8863dad08 100644
--- a/sys/arch/hp300/dev/grf.c
+++ b/sys/arch/hp300/dev/grf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: grf.c,v 1.11 2001/05/10 21:08:48 millert Exp $	*/
+/*	$OpenBSD: grf.c,v 1.12 2001/06/27 04:05:44 art Exp $	*/
 /*	$NetBSD: grf.c,v 1.30 1998/08/20 08:33:41 kleink Exp $	*/
 
 /*
@@ -78,9 +78,7 @@ extern struct emul emul_hpux;
 #include <vm/vm_page.h>
 #include <vm/vm_pager.h>
 
-#if defined(UVM)
 #include <uvm/uvm.h>
-#endif
 
 #include <miscfs/specfs/specdev.h>
 
@@ -642,16 +640,10 @@ grfmap(dev, addrp, p)
 	vn.v_type = VCHR;			/* XXX */
 	vn.v_specinfo = &si;			/* XXX */
 	vn.v_rdev = dev;			/* XXX */
-#if defined(UVM)
 	error = uvm_mmap(&p->p_vmspace->vm_map, (vaddr_t *)addrp,
 			 (vsize_t)len, VM_PROT_ALL, VM_PROT_ALL,
 			 flags, (caddr_t)&vn, 0,
 			 p->p_rlimit[RLIMIT_MEMLOCK].rlim_cur);
-#else
-	error = vm_mmap(&p->p_vmspace->vm_map, (vaddr_t *)addrp,
-			(vsize_t)len, VM_PROT_ALL, VM_PROT_ALL,
-			flags, (caddr_t)&vn, 0);
-#endif
 	if (error == 0)
 		(void) (*gp->g_sw->gd_mode)(gp, GM_MAP, *addrp);
 	return(error);
@@ -676,12 +668,8 @@ grfunmap(dev, addr, p)
 		return(EINVAL);		/* XXX: how do we deal with this? */
 	(void) (*gp->g_sw->gd_mode)(gp, GM_UNMAP, 0);
 	size = round_page(gp->g_display.gd_regsize + gp->g_display.gd_fbsize);
-#if defined(UVM)
 	rv = uvm_unmap(&p->p_vmspace->vm_map, (vaddr_t)addr,
 	    (vaddr_t)addr + size);
-#else
-	rv = vm_deallocate(&p->p_vmspace->vm_map, (vaddr_t)addr, size);
-#endif
 	return(rv == KERN_SUCCESS ? 0 : EINVAL);
 }