[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/8c4740b8876f
branches:  netbsd-6
changeset: 773991:8c4740b8876f
user:      riz <riz%NetBSD.org@localhost>
date:      Mon Apr 09 17:58:11 2012 +0000

description:
Pull up following revision(s) (requested by chs in ticket #167):
        sys/uvm/uvm_glue.c: revision 1.158
fix uarea_system_poolpage_free() to handle freeing a uarea
that was not allocated by cpu_uarea_alloc() (ie. on plaforms
where cpu_uarea_alloc() failing is not fatal).
fixes PR 46284.

diffstat:

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

diffs (32 lines):

diff -r bc68366930b4 -r 8c4740b8876f sys/uvm/uvm_glue.c
--- a/sys/uvm/uvm_glue.c        Mon Apr 09 17:54:20 2012 +0000
+++ b/sys/uvm/uvm_glue.c        Mon Apr 09 17:58:11 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_glue.c,v 1.156.2.1 2012/02/20 21:54:57 sborrill Exp $      */
+/*     $NetBSD: uvm_glue.c,v 1.156.2.2 2012/04/09 17:58:11 riz Exp $   */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_glue.c,v 1.156.2.1 2012/02/20 21:54:57 sborrill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_glue.c,v 1.156.2.2 2012/04/09 17:58:11 riz Exp $");
 
 #include "opt_kgdb.h"
 #include "opt_kstack.h"
@@ -315,8 +315,11 @@
 static void
 uarea_system_poolpage_free(struct pool *pp, void *addr)
 {
-       if (!cpu_uarea_free(addr))
-               panic("%s: failed to free uarea %p", __func__, addr);
+       if (cpu_uarea_free(addr))
+               return;
+
+       uvm_km_free(kernel_map, (vaddr_t)addr, pp->pr_alloc->pa_pagesz,
+           UVM_KMF_WIRED);
 }
 
 static struct pool_allocator uvm_uarea_system_allocator = {