Module Name: src
Committed By: uebayasi
Date: Sun Jan 31 01:40:13 UTC 2010
Modified Files:
src/sys/uvm: uvm_fault.c
Log Message:
Correct previous; fix a miscalculation of offset-into-entry in MADV_SEQUENTIAL
case. Pointed out by po...@.
To generate a diff of this commit:
cvs rdiff -u -r1.131 -r1.132 src/sys/uvm/uvm_fault.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/uvm/uvm_fault.c
diff -u src/sys/uvm/uvm_fault.c:1.131 src/sys/uvm/uvm_fault.c:1.132
--- src/sys/uvm/uvm_fault.c:1.131 Sat Jan 30 15:13:25 2010
+++ src/sys/uvm/uvm_fault.c Sun Jan 31 01:40:12 2010
@@ -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) */
