diff options
author | Don Lewis <truckman@FreeBSD.org> | 2004-03-15 06:43:51 +0000 |
---|---|---|
committer | Don Lewis <truckman@FreeBSD.org> | 2004-03-15 06:43:51 +0000 |
commit | f0ea4612efe639be61617cc8e8914556866e1b9a (patch) | |
tree | 4d4ca8f545f7e149698fc1b6033164b1e829525f /sys/vm/vm_glue.c | |
parent | ce8660e395812c6a91616a64388605aada81f5c7 (diff) | |
download | src-f0ea4612efe639be61617cc8e8914556866e1b9a.tar.gz src-f0ea4612efe639be61617cc8e8914556866e1b9a.zip |
Style(9) changes.
Pointed out by: bde
Notes
Notes:
svn path=/head/; revision=127008
Diffstat (limited to 'sys/vm/vm_glue.c')
-rw-r--r-- | sys/vm/vm_glue.c | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c index 8ed5bdca6191..29855e96517d 100644 --- a/sys/vm/vm_glue.c +++ b/sys/vm/vm_glue.c @@ -183,29 +183,19 @@ useracc(addr, len, rw) return (rv == TRUE); } -/* - * MPSAFE - */ int -vslock(addr, len) - void *addr; - size_t len; +vslock(void *addr, size_t len) { - vm_offset_t start, end; + vm_offset_t end, start; int error, npages; start = trunc_page((vm_offset_t)addr); end = round_page((vm_offset_t)addr + len); - - /* disable wrap around */ if (end <= start) return (EINVAL); - npages = atop(end - start); - if (npages > vm_page_max_wired) return (ENOMEM); - PROC_LOCK(curproc); if (npages + pmap_wired_count(vm_map_pmap(&curproc->p_vmspace->vm_map)) > atop(lim_cur(curproc, RLIMIT_MEMLOCK))) { @@ -213,7 +203,6 @@ vslock(addr, len) return (ENOMEM); } PROC_UNLOCK(curproc); - #if 0 /* * XXX - not yet @@ -227,10 +216,8 @@ vslock(addr, len) if (npages + cnt.v_wire_count > vm_page_max_wired) return (EAGAIN); #endif - error = vm_map_wire(&curproc->p_vmspace->vm_map, start, end, - VM_MAP_WIRE_USER|VM_MAP_WIRE_NOHOLES); - + VM_MAP_WIRE_USER | VM_MAP_WIRE_NOHOLES); /* * Return EFAULT on error to match copy{in,out}() behaviour * rather than returning ENOMEM like mlock() would. @@ -238,19 +225,14 @@ vslock(addr, len) return (error == KERN_SUCCESS ? 0 : EFAULT); } -/* - * MPSAFE - */ void -vsunlock(addr, len) - void *addr; - size_t len; +vsunlock(void *addr, size_t len) { /* Rely on the parameter sanity checks performed by vslock(). */ (void)vm_map_unwire(&curproc->p_vmspace->vm_map, trunc_page((vm_offset_t)addr), round_page((vm_offset_t)addr + len), - VM_MAP_WIRE_SYSTEM|VM_MAP_WIRE_NOHOLES); + VM_MAP_WIRE_SYSTEM | VM_MAP_WIRE_NOHOLES); } /* |