[src/netbsd-6]: src/sys/uvm Pull up following revision(s) (requested by chs i...

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

details:   https://anonhg.NetBSD.org/src/rev/940225952f00
branches:  netbsd-6
changeset: 773970:940225952f00
user:      riz <riz%NetBSD.org@localhost>
date:      Tue Apr 03 15:40:36 2012 +0000

description:
Pull up following revision(s) (requested by chs in ticket #150):
        sys/uvm/uvm_amap.c: revision 1.106
adjust amap_cow_now() to make UVM_PAGE_TRKOWN happy.

diffstat:

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

diffs (42 lines):

diff -r 7375c8a53952 -r 940225952f00 sys/uvm/uvm_amap.c
--- a/sys/uvm/uvm_amap.c        Tue Apr 03 15:38:50 2012 +0000
+++ b/sys/uvm/uvm_amap.c        Tue Apr 03 15:40:36 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_amap.c,v 1.105 2012/01/27 19:48:41 para Exp $      */
+/*     $NetBSD: uvm_amap.c,v 1.105.2.1 2012/04/03 15:40:36 riz Exp $   */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_amap.c,v 1.105 2012/01/27 19:48:41 para Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_amap.c,v 1.105.2.1 2012/04/03 15:40:36 riz Exp $");
 
 #include "opt_uvmhist.h"
 
@@ -1035,6 +1035,7 @@
 
                nanon = uvm_analloc();
                if (nanon) {
+                       nanon->an_lock = amap->am_lock;
                        npg = uvm_pagealloc(NULL, 0, nanon, 0);
                } else {
                        npg = NULL;
@@ -1042,6 +1043,7 @@
                if (nanon == NULL || npg == NULL) {
                        amap_unlock(amap);
                        if (nanon) {
+                               nanon->an_lock = NULL;
                                nanon->an_ref--;
                                KASSERT(nanon->an_ref == 0);
                                uvm_anon_free(nanon);
@@ -1055,7 +1057,6 @@
                 * Also, setup its lock (share the with amap's lock).
                 */
 
-               nanon->an_lock = amap->am_lock;
                uvm_pagecopy(pg, npg);
                anon->an_ref--;
                KASSERT(anon->an_ref > 0);