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

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

details:   https://anonhg.NetBSD.org/src/rev/7e72a9b16bff
branches:  netbsd-6
changeset: 773927:7e72a9b16bff
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sat Mar 17 17:29:34 2012 +0000

description:
Pull up following revision(s) (requested by rmind in ticket #113):
        sys/uvm/uvm_km.c: revision 1.123
uvm_km_kmem_alloc: return ENOMEM on failure in PMAP_MAP_POOLPAGE case.

diffstat:

 sys/uvm/uvm_km.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (40 lines):

diff -r 5518b72b594f -r 7e72a9b16bff sys/uvm/uvm_km.c
--- a/sys/uvm/uvm_km.c  Sat Mar 17 17:28:40 2012 +0000
+++ b/sys/uvm/uvm_km.c  Sat Mar 17 17:29:34 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_km.c,v 1.120.2.1 2012/02/22 18:56:48 riz Exp $     */
+/*     $NetBSD: uvm_km.c,v 1.120.2.2 2012/03/17 17:29:34 bouyer Exp $  */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -120,7 +120,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_km.c,v 1.120.2.1 2012/02/22 18:56:48 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_km.c,v 1.120.2.2 2012/03/17 17:29:34 bouyer Exp $");
 
 #include "opt_uvmhist.h"
 
@@ -731,6 +731,7 @@
                                uvm_wait("plpg");
                                goto again;
                        }
+                       return ENOMEM;
                }
                va = PMAP_MAP_POOLPAGE(VM_PAGE_TO_PHYS(pg));
                if (__predict_false(va == 0)) {
@@ -768,7 +769,7 @@
                                return ENOMEM;
                        }
                }
-       
+
                pg->flags &= ~PG_BUSY;  /* new page */
                UVM_PAGE_OWN(pg, NULL);
                pmap_kenter_pa(loopva, VM_PAGE_TO_PHYS(pg),
@@ -815,4 +816,3 @@
 
        return (free < (total / 10));
 }
-