diff options
Diffstat (limited to 'sys/arch/mac68k/dev')
| -rw-r--r-- | sys/arch/mac68k/dev/grf.c | 13 | ||||
| -rw-r--r-- | sys/arch/mac68k/dev/nubus.c | 8 |
2 files changed, 2 insertions, 19 deletions
diff --git a/sys/arch/mac68k/dev/grf.c b/sys/arch/mac68k/dev/grf.c index e6972e51139..48c4bbd818d 100644 --- a/sys/arch/mac68k/dev/grf.c +++ b/sys/arch/mac68k/dev/grf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grf.c,v 1.13 2001/05/17 18:48:35 aaron Exp $ */ +/* $OpenBSD: grf.c,v 1.14 2001/06/27 04:22:37 art Exp $ */ /* $NetBSD: grf.c,v 1.41 1997/02/24 06:20:04 scottr Exp $ */ /* @@ -72,9 +72,7 @@ #include <vm/vm_page.h> #include <vm/vm_pager.h> -#if defined(UVM) #include <uvm/uvm.h> -#endif #include "nubus.h" #include "itevar.h" @@ -375,14 +373,9 @@ grfmap(dev, addrp, p) vn.v_specinfo = &si; /* XXX */ vn.v_rdev = dev; /* XXX */ -#if defined(UVM) error = uvm_mmap(&p->p_vmspace->vm_map, (vm_offset_t *)addrp, (vm_size_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, (vm_offset_t *) addrp, - (vm_size_t) len, VM_PROT_ALL, VM_PROT_ALL, flags, (caddr_t) &vn, 0); -#endif /* Offset into page: */ *addrp += (unsigned long) gp->sc_grfmode->fboff & 0xfff; @@ -417,12 +410,8 @@ grfunmap(dev, addr, p) size = round_page(gp->sc_grfmode->fbsize); -#if defined(UVM) rv = uvm_unmap(&p->p_vmspace->vm_map, (vm_offset_t)addr, (vm_offset_t)addr + size); -#else - rv = vm_deallocate(&p->p_vmspace->vm_map, (vm_offset_t) addr, size); -#endif return (rv == KERN_SUCCESS ? 0 : EINVAL); } diff --git a/sys/arch/mac68k/dev/nubus.c b/sys/arch/mac68k/dev/nubus.c index f1a931ac2f3..9130a53649a 100644 --- a/sys/arch/mac68k/dev/nubus.c +++ b/sys/arch/mac68k/dev/nubus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nubus.c,v 1.16 2001/06/08 08:09:00 art Exp $ */ +/* $OpenBSD: nubus.c,v 1.17 2001/06/27 04:22:37 art Exp $ */ /* $NetBSD: nubus.c,v 1.35 1997/04/22 20:20:32 scottr Exp $ */ /* @@ -41,9 +41,7 @@ #include <vm/vm_kern.h> #include <vm/vm_map.h> -#if defined(UVM) #include <uvm/uvm_extern.h> -#endif #include <machine/autoconf.h> #include <machine/bus.h> @@ -821,11 +819,7 @@ nubus_mapin(paddr, sz) sz = m68k_round_page(sz); /* Get some kernel virtual address space. */ -#if defined(UVM) va = uvm_km_valloc_wait(kernel_map, sz); -#else - va = kmem_alloc_wait(kernel_map, sz); -#endif if (va == 0) panic("bus_mapin"); retval = va + off; |