Module Name: src
Committed By: matt
Date: Thu Feb 9 03:15:18 UTC 2012
Modified Files:
src/sys/rump/librump/rumpkern [matt-nb5-mips64]: vm.c
Log Message:
Update uvm_pageout_done defintion.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.41.8.1 src/sys/rump/librump/rumpkern/vm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpkern/vm.c
diff -u src/sys/rump/librump/rumpkern/vm.c:1.41 src/sys/rump/librump/rumpkern/vm.c:1.41.8.1
--- src/sys/rump/librump/rumpkern/vm.c:1.41 Wed Oct 15 13:04:26 2008
+++ src/sys/rump/librump/rumpkern/vm.c Thu Feb 9 03:15:18 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: vm.c,v 1.41 2008/10/15 13:04:26 pooka Exp $ */
+/* vm.c,v 1.41 2008/10/15 13:04:26 pooka Exp */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -81,6 +81,8 @@ const struct uvm_pagerops aobj_pager = {
.pgo_put = ao_put,
};
+struct uvm_pggroup uvm_pggroup_store;
+
kmutex_t uvm_pageqlock;
struct uvmexp uvmexp;
@@ -517,7 +519,7 @@ uvm_page_unbusy(struct vm_page **pgs, in
}
void
-uvm_estimatepageable(int *active, int *inactive)
+uvm_estimatepageable(u_int *active, u_int *inactive)
{
/* XXX: guessing game */
@@ -639,17 +641,17 @@ vm_map_starved_p(struct vm_map *map)
}
void
-uvm_pageout_start(int npages)
+uvm_pageout_start(struct uvm_pggroup *grp, u_int npages)
{
uvmexp.paging += npages;
}
void
-uvm_pageout_done(int npages)
+uvm_pageout_done(struct vm_page *pg, bool freed)
{
- uvmexp.paging -= npages;
+ uvmexp.paging -= 1;
/*
* wake up either of pagedaemon or LWPs waiting for it.
@@ -660,6 +662,7 @@ uvm_pageout_done(int npages)
} else {
wakeup(&uvmexp.free);
}
+ return NULL;
}
/* XXX: following two are unfinished because lwp's are not refcounted yet */
@@ -767,3 +770,9 @@ uvm_km_free_poolpage(struct vm_map *map,
rumpuser_free((void *)addr);
}
+
+struct uvm_pggroup *
+uvm_page_to_pggroup(struct vm_page *pg)
+{
+ return &uvm_pggroup_store;
+}
