[src/trunk]: src/sys/uvm Fix bugs introduced by previous commit; allocated pa...

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

details:   https://anonhg.NetBSD.org/src/rev/99727c1baad8
branches:  trunk
changeset: 760492:99727c1baad8
user:      enami <enami%NetBSD.org@localhost>
date:      Thu Jan 06 05:51:57 2011 +0000

description:
Fix bugs introduced by previous commit; allocated page needs to be bound
with the anon, and uvmfault_anonget may be called with ufi NULL.

diffstat:

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

diffs (30 lines):

diff -r dc5b0f9cee8b -r 99727c1baad8 sys/uvm/uvm_fault.c
--- a/sys/uvm/uvm_fault.c       Thu Jan 06 03:37:55 2011 +0000
+++ b/sys/uvm/uvm_fault.c       Thu Jan 06 05:51:57 2011 +0000
@@ -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++;