diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2003-01-04 01:12:09 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2003-01-04 01:12:09 +0000 |
| commit | 45c1c18fc00aa5af4c923d350e0b34e3a20f684c (patch) | |
| tree | c3a25faf72de9ef685c78e60e46d681d5e730e78 /sys | |
| parent | f3461ec5d27101e548f7ad436d49ba53f428a09d (diff) | |
Correctly invoke pmap_enter() [fix last argument]
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/mvme88k/mvme88k/mem.c | 7 | ||||
| -rw-r--r-- | sys/arch/mvme88k/mvme88k/vm_machdep.c | 8 |
2 files changed, 9 insertions, 6 deletions
diff --git a/sys/arch/mvme88k/mvme88k/mem.c b/sys/arch/mvme88k/mvme88k/mem.c index 740191e3ef2..451b75f26d9 100644 --- a/sys/arch/mvme88k/mvme88k/mem.c +++ b/sys/arch/mvme88k/mvme88k/mem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mem.c,v 1.16 2002/04/28 15:17:09 miod Exp $ */ +/* $OpenBSD: mem.c,v 1.17 2003/01/04 01:12:08 miod Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -136,8 +136,9 @@ mmrw(dev, uio, flags) goto unlock; } pmap_enter(pmap_kernel(), (vm_offset_t)vmmap, - trunc_page(v), uio->uio_rw == UIO_READ ? - VM_PROT_READ : VM_PROT_WRITE, PMAP_WIRED); + trunc_page(v), + uio->uio_rw == UIO_READ ? VM_PROT_READ : VM_PROT_WRITE, + (uio->uio_rw == UIO_READ ? VM_PROT_READ : VM_PROT_WRITE) | PMAP_WIRED); pmap_update(pmap_kernel()); o = uio->uio_offset & PGOFSET; c = min(uio->uio_resid, (int)(NBPG - o)); diff --git a/sys/arch/mvme88k/mvme88k/vm_machdep.c b/sys/arch/mvme88k/mvme88k/vm_machdep.c index 54e3d28b31b..8978b6a65f0 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.48 2002/03/14 01:26:40 millert Exp $ */ +/* $OpenBSD: vm_machdep.c,v 1.49 2003/01/04 01:12:08 miod Exp $ */ /* * Copyright (c) 1998 Steve Murphree, Jr. @@ -257,7 +257,8 @@ vmapbuf(bp, len) if (pmap_extract(pmap, (vm_offset_t)addr, &pa) == FALSE) panic("vmapbuf: null page frame"); pmap_enter(vm_map_pmap(phys_map), kva, pa, - VM_PROT_READ|VM_PROT_WRITE, PMAP_WIRED); + VM_PROT_READ | VM_PROT_WRITE, + VM_PROT_READ | VM_PROT_WRITE | PMAP_WIRED); addr += PAGE_SIZE; kva += PAGE_SIZE; len -= PAGE_SIZE; @@ -332,7 +333,8 @@ iomap_mapin(vm_offset_t pa, vm_size_t len, boolean_t canwait) while (len>0) { pmap_enter(vm_map_pmap(iomap_map), tva, ppa, - VM_PROT_WRITE|VM_PROT_READ|(CACHE_INH << 16), PMAP_WIRED); + VM_PROT_WRITE | VM_PROT_READ |(CACHE_INH << 16), + VM_PROT_WRITE | VM_PROT_READ | PMAP_WIRED); len -= PAGE_SIZE; tva += PAGE_SIZE; ppa += PAGE_SIZE; |