Module Name: src
Committed By: enami
Date: Thu Jan 6 05:51:57 UTC 2011
Modified Files:
src/sys/uvm: uvm_fault.c
Log Message:
Fix bugs introduced by previous commit; allocated page needs to be bound
with the anon, and uvmfault_anonget may be called with ufi NULL.
To generate a diff of this commit:
cvs rdiff -u -r1.179 -r1.180 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.179 src/sys/uvm/uvm_fault.c:1.180
--- src/sys/uvm/uvm_fault.c:1.179 Tue Jan 4 08:26:33 2011
+++ src/sys/uvm/uvm_fault.c Thu Jan 6 05:51:57 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_fault.c,v 1.179 2011/01/04 08:26:33 matt Exp $ */
+/* $NetBSD: uvm_fault.c,v 1.180 2011/01/06 05:51:57 enami Exp $ */
/*
*
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_fault.c,v 1.179 2011/01/04 08:26:33 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_fault.c,v 1.180 2011/01/06 05:51:57 enami Exp $");
#include "opt_uvmhist.h"
@@ -361,8 +361,9 @@
* no page, we must try and bring it in.
*/
- pg = uvm_pagealloc(NULL, ufi->orig_rvaddr,
- NULL, UVM_FLAG_COLORMATCH);
+ pg = uvm_pagealloc(NULL,
+ ufi != NULL ? ufi->orig_rvaddr : 0,
+ anon, UVM_FLAG_COLORMATCH);
if (pg == NULL) { /* out of RAM. */
uvmfault_unlockall(ufi, amap, NULL, anon);
uvmexp.fltnoram++;
