summaryrefslogtreecommitdiff
path: root/sys/uvm/uvm_pager.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/uvm/uvm_pager.c')
-rw-r--r--sys/uvm/uvm_pager.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/sys/uvm/uvm_pager.c b/sys/uvm/uvm_pager.c
index 10a4dc55777..87849f905c8 100644
--- a/sys/uvm/uvm_pager.c
+++ b/sys/uvm/uvm_pager.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uvm_pager.c,v 1.62 2013/05/30 16:29:46 tedu Exp $ */
+/* $OpenBSD: uvm_pager.c,v 1.63 2013/06/11 16:42:19 deraadt Exp $ */
/* $NetBSD: uvm_pager.c,v 1.36 2000/11/27 18:26:41 chs Exp $ */
/*
@@ -462,7 +462,7 @@ uvm_mk_pcluster(struct uvm_object *uobj, struct vm_page **pps, int *npages,
* PGO_PDFREECLUST: pagedaemon: drop cluster on successful I/O
* PGO_FREE: tell the aio daemon to free pages in the async case.
* => start/stop: if (uobj && !PGO_ALLPAGES) limit targets to this range
- * if (!uobj) start is the (daddr64_t) of the starting swapblk
+ * if (!uobj) start is the (daddr_t) of the starting swapblk
* => return state:
* 1. we return the VM_PAGER status code of the pageout
* 2. we return with the page queues unlocked
@@ -480,7 +480,7 @@ uvm_pager_put(struct uvm_object *uobj, struct vm_page *pg,
voff_t start, voff_t stop)
{
int result;
- daddr64_t swblk;
+ daddr_t swblk;
struct vm_page **ppsp = *ppsp_ptr;
/*
@@ -517,7 +517,7 @@ uvm_pager_put(struct uvm_object *uobj, struct vm_page *pg,
* interested in (in which case the whole cluster gets dropped
* in the event of an error or a sync "done").
*/
- swblk = (daddr64_t) start;
+ swblk = (daddr_t) start;
/* ppsp and npages should be ok */
}
@@ -533,7 +533,7 @@ ReTry:
if (uobj) {
result = uobj->pgops->pgo_put(uobj, ppsp, *npages, flags);
} else {
- /* XXX daddr64_t -> int */
+ /* XXX daddr_t -> int */
result = uvm_swap_put(swblk, ppsp, *npages, flags);
}
@@ -579,7 +579,7 @@ ReTry:
*/
if (uobj == NULL && pg != NULL) {
- /* XXX daddr64_t -> int */
+ /* XXX daddr_t -> int */
int nswblk = (result == VM_PAGER_AGAIN) ? swblk : 0;
if (pg->pg_flags & PQ_ANON) {
pg->uanon->an_swslot = nswblk;
@@ -598,10 +598,10 @@ ReTry:
if (uobj == NULL) {
if (pg) {
- /* XXX daddr64_t -> int */
+ /* XXX daddr_t -> int */
uvm_swap_free(swblk + 1, *npages - 1);
} else {
- /* XXX daddr64_t -> int */
+ /* XXX daddr_t -> int */
uvm_swap_free(swblk, *npages);
}
}
@@ -618,7 +618,7 @@ ReTry:
* free swslots that we mark bad.
*/
- /* XXX daddr64_t -> int */
+ /* XXX daddr_t -> int */
uvm_swap_markbad(swblk, *npages);
}
}