diff options
| author |   art <art@openbsd.org> | 2001-11-28 13:47:37 +0000 |
|---|---|---|
| committer | art <art@openbsd.org> | 2001-11-28 13:47:37 +0000 |
| commit | 738a5b4da06e019a6663e50907eee782a84c1d2c (patch) | |
| tree | a9528876cee85d24717d63972424ba0a09fc472e /sys/uvm/uvm_glue.c | |
| parent | typo in sockopt level name (ipsec6 related) (diff) | |
| download | wireguard-openbsd-738a5b4da06e019a6663e50907eee782a84c1d2c.tar.xz wireguard-openbsd-738a5b4da06e019a6663e50907eee782a84c1d2c.zip | |
Sync in more uvm changes from NetBSD.
This time we're getting rid of KERN_* and VM_PAGER_* error codes and
use errnos instead.
Diffstat (limited to 'sys/uvm/uvm_glue.c')
| -rw-r--r-- | sys/uvm/uvm_glue.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/sys/uvm/uvm_glue.c b/sys/uvm/uvm_glue.c index 78e881bef6e..4eb6e146a83 100644 --- a/sys/uvm/uvm_glue.c +++ b/sys/uvm/uvm_glue.c @@ -1,5 +1,5 @@ -/* $OpenBSD: uvm_glue.c,v 1.26 2001/11/10 19:20:39 art Exp $ */ -/* $NetBSD: uvm_glue.c,v 1.44 2001/02/06 19:54:44 eeh Exp $ */ +/* $OpenBSD: uvm_glue.c,v 1.27 2001/11/28 13:47:39 art Exp $ */ +/* $NetBSD: uvm_glue.c,v 1.45 2001/03/15 06:10:57 chs Exp $ */ /* * Copyright (c) 1997 Charles D. Cranor and Washington University. @@ -218,15 +218,13 @@ uvm_vslock(p, addr, len, access_type) { vm_map_t map; vaddr_t start, end; - int rv; + int error; map = &p->p_vmspace->vm_map; start = trunc_page((vaddr_t)addr); end = round_page((vaddr_t)addr + len); - - rv = uvm_fault_wire(map, start, end, access_type); - - return (rv); + error = uvm_fault_wire(map, start, end, access_type); + return error; } /* @@ -271,7 +269,7 @@ uvm_fork(p1, p2, shared, stack, stacksize, func, arg) void *arg; { struct user *up = p2->p_addr; - int rv; + int error; if (shared == TRUE) { p2->p_vmspace = NULL; @@ -288,10 +286,10 @@ uvm_fork(p1, p2, shared, stack, stacksize, func, arg) * Note the kernel stack gets read/write accesses right off * the bat. */ - rv = uvm_fault_wire(kernel_map, (vaddr_t)up, + error = uvm_fault_wire(kernel_map, (vaddr_t)up, (vaddr_t)up + USPACE, VM_PROT_READ | VM_PROT_WRITE); - if (rv != KERN_SUCCESS) - panic("uvm_fork: uvm_fault_wire failed: %d", rv); + if (error) + panic("uvm_fork: uvm_fault_wire failed: %d", error); /* * p_stats currently points at a field in the user struct. Copy |