diff options
| author |   thib <thib@openbsd.org> | 2007-12-18 11:05:52 +0000 |
|---|---|---|
| committer | thib <thib@openbsd.org> | 2007-12-18 11:05:52 +0000 |
| commit | fd21a507121e3cd62106a120ec219a99ef81b1de (patch) | |
| tree | aa6ee208b51c84ff34721870a801995d293bd13e /sys/uvm/uvm_pdaemon.c | |
| parent | make it possible to run without locking the database. To be used by (diff) | |
| download | wireguard-openbsd-fd21a507121e3cd62106a120ec219a99ef81b1de.tar.xz wireguard-openbsd-fd21a507121e3cd62106a120ec219a99ef81b1de.zip | |
Turn the uvm_{lock/unlock}_fpageq() inlines into
macros that just expand into the mutex functions
to keep the abstraction, do assorted cleanup.
ok miod@,art@
Diffstat (limited to 'sys/uvm/uvm_pdaemon.c')
| -rw-r--r-- | sys/uvm/uvm_pdaemon.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sys/uvm/uvm_pdaemon.c b/sys/uvm/uvm_pdaemon.c index 1fefe67f2dd..7e919ea2db7 100644 --- a/sys/uvm/uvm_pdaemon.c +++ b/sys/uvm/uvm_pdaemon.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_pdaemon.c,v 1.33 2007/06/18 21:51:15 pedro Exp $ */ +/* $OpenBSD: uvm_pdaemon.c,v 1.34 2007/12/18 11:05:52 thib Exp $ */ /* $NetBSD: uvm_pdaemon.c,v 1.23 2000/08/20 10:24:14 bjh21 Exp $ */ /* @@ -337,9 +337,9 @@ uvm_aiodone_daemon(void *arg) bp = nbp; } if (free <= uvmexp.reserve_kernel) { - s = uvm_lock_fpageq(); + uvm_lock_fpageq(); wakeup(&uvm.pagedaemon); - uvm_unlock_fpageq(s); + uvm_unlock_fpageq(); } else { simple_lock(&uvm.pagedaemon_lock); wakeup(&uvmexp.free); @@ -365,7 +365,7 @@ uvmpd_scan_inactive(pglst) struct pglist *pglst; { boolean_t retval = FALSE; /* assume we haven't hit target */ - int s, free, result; + int free, result; struct vm_page *p, *nextpg; struct uvm_object *uobj; struct vm_page *pps[MAXBSIZE >> PAGE_SHIFT], **ppsp; @@ -415,9 +415,9 @@ uvmpd_scan_inactive(pglst) * our target */ - s = uvm_lock_fpageq(); + uvm_lock_fpageq(); free = uvmexp.free; - uvm_unlock_fpageq(s); + uvm_unlock_fpageq(); if (free + uvmexp.paging >= uvmexp.freetarg << 2 || dirtyreacts == UVMPD_NUMDIRTYREACTS) { @@ -957,7 +957,7 @@ uvmpd_scan_inactive(pglst) void uvmpd_scan() { - int s, free, inactive_shortage, swap_shortage, pages_freed; + int free, inactive_shortage, swap_shortage, pages_freed; struct vm_page *p, *nextpg; struct uvm_object *uobj; boolean_t got_it; @@ -969,9 +969,9 @@ uvmpd_scan() /* * get current "free" page count */ - s = uvm_lock_fpageq(); + uvm_lock_fpageq(); free = uvmexp.free; - uvm_unlock_fpageq(s); + uvm_unlock_fpageq(); #ifndef __SWAP_BROKEN /* |