summaryrefslogtreecommitdiff
path: root/sys/uvm
diff options
context:
space:
mode:
authorThordur I. Bjornsson <thib@cvs.openbsd.org>2010-09-26 12:53:28 +0000
committerThordur I. Bjornsson <thib@cvs.openbsd.org>2010-09-26 12:53:28 +0000
commitcf1992f09ba99b51344245a0ee445190806b04f7 (patch)
tree30dabf41ed62668824e5d7a5eaac48c573bc318f /sys/uvm
parent7be9483015dbb094040b50cf42647f6c1b0afb94 (diff)
remove static so things show up in ddb.
ok miod@, oga@, tedu@
Diffstat (limited to 'sys/uvm')
-rw-r--r--sys/uvm/uvm_pdaemon.c12
-rw-r--r--sys/uvm/uvm_swap.c52
2 files changed, 32 insertions, 32 deletions
diff --git a/sys/uvm/uvm_pdaemon.c b/sys/uvm/uvm_pdaemon.c
index a4b44161fda..5fa7597c35d 100644
--- a/sys/uvm/uvm_pdaemon.c
+++ b/sys/uvm/uvm_pdaemon.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uvm_pdaemon.c,v 1.55 2009/10/14 17:53:30 beck Exp $ */
+/* $OpenBSD: uvm_pdaemon.c,v 1.56 2010/09/26 12:53:27 thib Exp $ */
/* $NetBSD: uvm_pdaemon.c,v 1.23 2000/08/20 10:24:14 bjh21 Exp $ */
/*
@@ -96,9 +96,9 @@
* local prototypes
*/
-static void uvmpd_scan(void);
-static boolean_t uvmpd_scan_inactive(struct pglist *);
-static void uvmpd_tune(void);
+void uvmpd_scan(void);
+boolean_t uvmpd_scan_inactive(struct pglist *);
+void uvmpd_tune(void);
/*
* uvm_wait: wait (sleep) for the page daemon to free some pages
@@ -155,7 +155,7 @@ uvm_wait(const char *wmsg)
* => caller must call with page queues locked
*/
-static void
+void
uvmpd_tune(void)
{
UVMHIST_FUNC("uvmpd_tune"); UVMHIST_CALLED(pdhist);
@@ -329,7 +329,7 @@ uvm_aiodone_daemon(void *arg)
* => we return TRUE if we are exiting because we met our target
*/
-static boolean_t
+boolean_t
uvmpd_scan_inactive(struct pglist *pglst)
{
boolean_t retval = FALSE; /* assume we haven't hit target */
diff --git a/sys/uvm/uvm_swap.c b/sys/uvm/uvm_swap.c
index cdc156f1a13..da3330aa093 100644
--- a/sys/uvm/uvm_swap.c
+++ b/sys/uvm/uvm_swap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uvm_swap.c,v 1.97 2010/09/10 16:34:09 thib Exp $ */
+/* $OpenBSD: uvm_swap.c,v 1.98 2010/09/26 12:53:27 thib Exp $ */
/* $NetBSD: uvm_swap.c,v 1.40 2000/11/17 11:39:39 mrg Exp $ */
/*
@@ -218,11 +218,11 @@ struct pool vndbuf_pool;
/*
* local variables
*/
-static struct extent *swapmap; /* controls the mapping of /dev/drum */
+struct extent *swapmap; /* controls the mapping of /dev/drum */
/* list of all active swap devices [by priority] */
LIST_HEAD(swap_priority, swappri);
-static struct swap_priority swap_priority;
+struct swap_priority swap_priority;
/* locks */
struct rwlock swap_syscall_lock = RWLOCK_INITIALIZER("swplk");
@@ -230,25 +230,25 @@ struct rwlock swap_syscall_lock = RWLOCK_INITIALIZER("swplk");
/*
* prototypes
*/
-static void swapdrum_add(struct swapdev *, int);
-static struct swapdev *swapdrum_getsdp(int);
+void swapdrum_add(struct swapdev *, int);
+struct swapdev *swapdrum_getsdp(int);
-static struct swapdev *swaplist_find(struct vnode *, int);
-static void swaplist_insert(struct swapdev *,
- struct swappri *, int);
-static void swaplist_trim(void);
+struct swapdev *swaplist_find(struct vnode *, int);
+void swaplist_insert(struct swapdev *,
+ struct swappri *, int);
+void swaplist_trim(void);
-static int swap_on(struct proc *, struct swapdev *);
-static int swap_off(struct proc *, struct swapdev *);
+int swap_on(struct proc *, struct swapdev *);
+int swap_off(struct proc *, struct swapdev *);
-static void sw_reg_strategy(struct swapdev *, struct buf *, int);
+void sw_reg_strategy(struct swapdev *, struct buf *, int);
void sw_reg_iodone(struct buf *);
void sw_reg_iodone_internal(void *, void *);
-static void sw_reg_start(struct swapdev *);
+void sw_reg_start(struct swapdev *);
-static int uvm_swap_io(struct vm_page **, int, int, int);
+int uvm_swap_io(struct vm_page **, int, int, int);
-static void swapmount(void);
+void swapmount(void);
boolean_t uvm_swap_allocpages(struct vm_page **, int);
#ifdef UVM_SWAP_ENCRYPT
@@ -481,7 +481,7 @@ uvm_swap_finicrypt_all(void)
* FREE it if we don't need it... this it to prevent malloc blocking
* here while adding swap)
*/
-static void
+void
swaplist_insert(struct swapdev *sdp, struct swappri *newspp, int priority)
{
struct swappri *spp, *pspp;
@@ -533,7 +533,7 @@ swaplist_insert(struct swapdev *sdp, struct swappri *newspp, int priority)
* => caller must hold both swap_syscall_lock and uvm.swap_data_lock
* => we return the swapdev we found (and removed)
*/
-static struct swapdev *
+struct swapdev *
swaplist_find(struct vnode *vp, boolean_t remove)
{
struct swapdev *sdp;
@@ -566,7 +566,7 @@ swaplist_find(struct vnode *vp, boolean_t remove)
*
* => caller must hold both swap_syscall_lock and uvm.swap_data_lock
*/
-static void
+void
swaplist_trim(void)
{
struct swappri *spp, *nextspp;
@@ -587,7 +587,7 @@ swaplist_trim(void)
* => caller must hold swap_syscall_lock
* => uvm.swap_data_lock should be unlocked (we may sleep)
*/
-static void
+void
swapdrum_add(struct swapdev *sdp, int npages)
{
u_long result;
@@ -607,7 +607,7 @@ swapdrum_add(struct swapdev *sdp, int npages)
* => each swapdev takes one big contig chunk of the drum
* => caller must hold uvm.swap_data_lock
*/
-static struct swapdev *
+struct swapdev *
swapdrum_getsdp(int pgno)
{
struct swapdev *sdp;
@@ -895,7 +895,7 @@ out:
* => caller should leave uvm.swap_data_lock unlocked, we may lock it
* if needed.
*/
-static int
+int
swap_on(struct proc *p, struct swapdev *sdp)
{
static int count = 0; /* static */
@@ -1094,7 +1094,7 @@ bad:
*
* => swap data should be locked, we will unlock.
*/
-static int
+int
swap_off(struct proc *p, struct swapdev *sdp)
{
int error = 0;
@@ -1243,7 +1243,7 @@ swstrategy(struct buf *bp)
/*
* sw_reg_strategy: handle swap i/o to regular files
*/
-static void
+void
sw_reg_strategy(struct swapdev *sdp, struct buf *bp, int bn)
{
struct vnode *vp;
@@ -1416,7 +1416,7 @@ out: /* Arrive here at splbio */
}
/* sw_reg_start: start an I/O request on the requested swapdev. */
-static void
+void
sw_reg_start(struct swapdev *sdp)
{
struct buf *bp;
@@ -1762,7 +1762,7 @@ uvm_swap_get(struct vm_page *page, int swslot, int flags)
* uvm_swap_io: do an i/o operation to swap
*/
-static int
+int
uvm_swap_io(struct vm_page **pps, int startslot, int npages, int flags)
{
daddr64_t startblk;
@@ -2086,7 +2086,7 @@ uvm_swap_io(struct vm_page **pps, int startslot, int npages, int flags)
return (result);
}
-static void
+void
swapmount(void)
{
struct swapdev *sdp;