diff options
| author |   art <art@openbsd.org> | 1999-07-15 14:07:41 +0000 |
|---|---|---|
| committer | art <art@openbsd.org> | 1999-07-15 14:07:41 +0000 |
| commit | d01f7d6a6e21499b5abdde1c62ada7685e973c12 (patch) | |
| tree | 62d5a67026eb4be33f62e89af213307068981a61 /sys/kern/sys_pipe.c | |
| parent | Back out the mis-commit of my development ISDN modifications. (diff) | |
| download | wireguard-openbsd-d01f7d6a6e21499b5abdde1c62ada7685e973c12.tar.xz wireguard-openbsd-d01f7d6a6e21499b5abdde1c62ada7685e973c12.zip | |
vm_offset_t -> {v,p}addr_t ; vm_size_t -> {v,p}size_t
Diffstat (limited to 'sys/kern/sys_pipe.c')
| -rw-r--r-- | sys/kern/sys_pipe.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c index 0673d952d38..42060795d7c 100644 --- a/sys/kern/sys_pipe.c +++ b/sys/kern/sys_pipe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sys_pipe.c,v 1.16 1999/07/13 15:17:50 provos Exp $ */ +/* $OpenBSD: sys_pipe.c,v 1.17 1999/07/15 14:07:41 art Exp $ */ /* * Copyright (c) 1996 John S. Dyson @@ -243,12 +243,12 @@ pipespace(cpipe) */ #if defined(__FreeBSD__) error = vm_map_find(kernel_map, cpipe->pipe_buffer.object, 0, - (vm_offset_t *) &cpipe->pipe_buffer.buffer, + (vaddr_t *) &cpipe->pipe_buffer.buffer, cpipe->pipe_buffer.size, 1, VM_PROT_ALL, VM_PROT_ALL, 0); #else /* (__NetBSD__) || (__OpenBSD__) */ error = vm_map_find(kernel_map, cpipe->pipe_buffer.object, 0, - (vm_offset_t *) &cpipe->pipe_buffer.buffer, + (vaddr_t *) &cpipe->pipe_buffer.buffer, cpipe->pipe_buffer.size, 1); #endif @@ -509,7 +509,7 @@ pipe_build_write_buffer(wpipe, uio) { int size; int i; - vm_offset_t addr, endaddr, paddr; + vaddr_t addr, endaddr, paddr; size = uio->uio_iov->iov_len; if (size > wpipe->pipe_buffer.size) @@ -540,7 +540,7 @@ pipe_build_write_buffer(wpipe, uio) * set up the control block */ wpipe->pipe_map.npages = i; - wpipe->pipe_map.pos = ((vm_offset_t) uio->uio_iov->iov_base) & PAGE_MASK; + wpipe->pipe_map.pos = ((vaddr_t) uio->uio_iov->iov_base) & PAGE_MASK; wpipe->pipe_map.cnt = size; /* @@ -583,7 +583,7 @@ struct pipe *wpipe; pmap_qremove(wpipe->pipe_map.kva, wpipe->pipe_map.npages); if (amountpipekva > MAXPIPEKVA) { - vm_offset_t kva = wpipe->pipe_map.kva; + vaddr_t kva = wpipe->pipe_map.kva; wpipe->pipe_map.kva = 0; kmem_free(kernel_map, kva, wpipe->pipe_buffer.size + PAGE_SIZE); @@ -748,11 +748,11 @@ pipe_write(fp, uio, cred) amountpipekva -= wpipe->pipe_buffer.size; #if defined(UVM) uvm_km_free(kernel_map, - (vm_offset_t)wpipe->pipe_buffer.buffer, + (vaddr_t)wpipe->pipe_buffer.buffer, wpipe->pipe_buffer.size); #else kmem_free(kernel_map, - (vm_offset_t)wpipe->pipe_buffer.buffer, + (vaddr_t)wpipe->pipe_buffer.buffer, wpipe->pipe_buffer.size); #endif } @@ -1128,11 +1128,11 @@ pipeclose(cpipe) amountpipekva -= cpipe->pipe_buffer.size; #if defined(UVM) uvm_km_free(kernel_map, - (vm_offset_t)cpipe->pipe_buffer.buffer, + (vaddr_t)cpipe->pipe_buffer.buffer, cpipe->pipe_buffer.size); #else kmem_free(kernel_map, - (vm_offset_t)cpipe->pipe_buffer.buffer, + (vaddr_t)cpipe->pipe_buffer.buffer, cpipe->pipe_buffer.size); #endif } |