Module Name: src
Committed By: matt
Date: Thu Dec 19 01:20:41 UTC 2013
Modified Files:
src/sys/rump/librump/rumpkern [matt-nb5-mips64]: vm.c
src/sys/ufs/lfs [matt-nb5-mips64]: lfs_bio.c
Log Message:
Adapt to new uvm_estimatepageable arguments
To generate a diff of this commit:
cvs rdiff -u -r1.41.8.2 -r1.41.8.3 src/sys/rump/librump/rumpkern/vm.c
cvs rdiff -u -r1.114 -r1.114.18.1 src/sys/ufs/lfs/lfs_bio.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.8.2 src/sys/rump/librump/rumpkern/vm.c:1.41.8.3
--- src/sys/rump/librump/rumpkern/vm.c:1.41.8.2 Fri Feb 10 06:00:55 2012
+++ src/sys/rump/librump/rumpkern/vm.c Thu Dec 19 01:20:41 2013
@@ -519,7 +519,8 @@ uvm_page_unbusy(struct vm_page **pgs, in
}
void
-uvm_estimatepageable(u_int *active, u_int *inactive)
+uvm_estimatepageable(const struct uvm_pggroup *pg,
+ u_int *active, u_int *inactive)
{
/* XXX: guessing game */
Index: src/sys/ufs/lfs/lfs_bio.c
diff -u src/sys/ufs/lfs/lfs_bio.c:1.114 src/sys/ufs/lfs/lfs_bio.c:1.114.18.1
--- src/sys/ufs/lfs/lfs_bio.c:1.114 Tue May 6 18:43:45 2008
+++ src/sys/ufs/lfs/lfs_bio.c Thu Dec 19 01:20:41 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_bio.c,v 1.114 2008/05/06 18:43:45 ad Exp $ */
+/* $NetBSD: lfs_bio.c,v 1.114.18.1 2013/12/19 01:20:41 matt Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003, 2008 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_bio.c,v 1.114 2008/05/06 18:43:45 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_bio.c,v 1.114.18.1 2013/12/19 01:20:41 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -842,7 +842,7 @@ lfs_wait_pages(void)
{
int active, inactive;
- uvm_estimatepageable(&active, &inactive);
+ uvm_estimatepageable(NULL, &active, &inactive);
return LFS_WAIT_RESOURCE(active + inactive + uvmexp.free, 1);
}
@@ -851,6 +851,6 @@ lfs_max_pages(void)
{
int active, inactive;
- uvm_estimatepageable(&active, &inactive);
+ uvm_estimatepageable(NULL, &active, &inactive);
return LFS_MAX_RESOURCE(active + inactive + uvmexp.free, 1);
}
