[src/trunk]: src/sys/uvm Correct previous; fix a miscalculation of offset-int...

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

details:   https://anonhg.NetBSD.org/src/rev/a8fa71e166b3
branches:  trunk
changeset: 751277:a8fa71e166b3
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Sun Jan 31 01:40:12 2010 +0000

description:
Correct previous; fix a miscalculation of offset-into-entry in MADV_SEQUENTIAL
case.  Pointed out by pooka@.

diffstat:

 sys/uvm/uvm_fault.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (35 lines):

diff -r 9b926bcdc12d -r a8fa71e166b3 sys/uvm/uvm_fault.c
--- a/sys/uvm/uvm_fault.c       Sun Jan 31 01:38:48 2010 +0000
+++ b/sys/uvm/uvm_fault.c       Sun Jan 31 01:40:12 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_fault.c,v 1.131 2010/01/30 15:13:25 uebayasi Exp $ */
+/*     $NetBSD: uvm_fault.c,v 1.132 2010/01/31 01:40:12 uebayasi Exp $ */
 
 /*
  *
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_fault.c,v 1.131 2010/01/30 15:13:25 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_fault.c,v 1.132 2010/01/31 01:40:12 uebayasi Exp $");
 
 #include "opt_uvmhist.h"
 
@@ -873,7 +873,7 @@
 
        }
        /* offset from entry's start to pgs' start */
-       const voff_t eoff = startva - ufi.entry->start;
+       voff_t eoff = startva - ufi.entry->start;
 
        /* locked: maps(read) */
        UVMHIST_LOG(maphist, "  narrow=%d, back=%d, forw=%d, startva=0x%x",
@@ -923,6 +923,7 @@
                startva += (nback << PAGE_SHIFT);
                npages -= nback;
                nback = centeridx = 0;
+               eoff = startva - ufi.entry->start;
        }
 
        /* locked: maps(read), amap(if there) */