[src/netbsd-3]: src/sys/uvm Pull up revision 1.188 (requested by dbj in ticke...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c427f04ebfa6
branches:  netbsd-3
changeset: 575307:c427f04ebfa6
user:      tron <tron%NetBSD.org@localhost>
date:      Fri Apr 08 00:22:48 2005 +0000

description:
Pull up revision 1.188 (requested by dbj in ticket #123):
use voff_t instead of vaddr_t to hold file offset passed to pgo_put

diffstat:

 sys/uvm/uvm_map.c |  11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diffs (43 lines):

diff -r 62cbd065298e -r c427f04ebfa6 sys/uvm/uvm_map.c
--- a/sys/uvm/uvm_map.c Thu Apr 07 17:07:08 2005 +0000
+++ b/sys/uvm/uvm_map.c Fri Apr 08 00:22:48 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_map.c,v 1.186 2005/02/28 16:55:54 chs Exp $        */
+/*     $NetBSD: uvm_map.c,v 1.186.2.1 2005/04/08 00:22:48 tron Exp $   */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -71,7 +71,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.186 2005/02/28 16:55:54 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.186.2.1 2005/04/08 00:22:48 tron Exp $");
 
 #include "opt_ddb.h"
 #include "opt_uvmhist.h"
@@ -3406,6 +3406,7 @@
        struct vm_page *pg;
        vaddr_t offset;
        vsize_t size;
+       voff_t uoff;
        int error, refs;
        UVMHIST_FUNC("uvm_map_clean"); UVMHIST_CALLED(maphist);
 
@@ -3538,13 +3539,13 @@
                 * data from files.
                 */
 
-               offset = current->offset + (start - current->start);
+               uoff = current->offset + (start - current->start);
                size = MIN(end, current->end) - start;
                if (uobj != NULL) {
                        simple_lock(&uobj->vmobjlock);
                        if (uobj->pgops->pgo_put != NULL)
-                               error = (uobj->pgops->pgo_put)(uobj, offset,
-                                   offset + size, flags | PGO_CLEANIT);
+                               error = (uobj->pgops->pgo_put)(uobj, uoff,
+                                   uoff + size, flags | PGO_CLEANIT);
                        else
                                error = 0;
                }