[src/trunk]: src/sys/uvm bring file up to date for previous vmem changes.

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

details:   https://anonhg.NetBSD.org/src/rev/e8c4d18252c4
branches:  trunk
changeset: 784496:e8c4d18252c4
user:      para <para%NetBSD.org@localhost>
date:      Tue Jan 29 21:29:40 2013 +0000

description:
bring file up to date for previous vmem changes.

diffstat:

 sys/uvm/uvm_km.c |  22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

diffs (70 lines):

diff -r 473ecdd4cfbc -r e8c4d18252c4 sys/uvm/uvm_km.c
--- a/sys/uvm/uvm_km.c  Tue Jan 29 21:26:24 2013 +0000
+++ b/sys/uvm/uvm_km.c  Tue Jan 29 21:29:40 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_km.c,v 1.137 2013/01/26 15:18:01 para Exp $        */
+/*     $NetBSD: uvm_km.c,v 1.138 2013/01/29 21:29:40 para Exp $        */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -152,7 +152,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_km.c,v 1.137 2013/01/26 15:18:01 para Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_km.c,v 1.138 2013/01/29 21:29:40 para Exp $");
 
 #include "opt_uvmhist.h"
 
@@ -180,6 +180,7 @@
 #include <sys/proc.h>
 #include <sys/pool.h>
 #include <sys/vmem.h>
+#include <sys/vmem_impl.h>
 #include <sys/kmem.h>
 
 #include <uvm/uvm.h>
@@ -202,7 +203,9 @@
 vaddr_t kmembase;
 vsize_t kmemsize;
 
+static struct vmem kmem_arena_store;
 vmem_t *kmem_arena = NULL;
+static struct vmem kmem_va_arena_store;
 vmem_t *kmem_va_arena;
 
 /*
@@ -324,10 +327,9 @@
        kernel_map = &kernel_map_store;
 
        pool_subsystem_init();
-       vmem_bootstrap();
 
-       kmem_arena = vmem_create("kmem", kmembase, kmemsize, PAGE_SIZE,
-           NULL, NULL, NULL,
+       kmem_arena = vmem_init(&kmem_arena_store, "kmem",
+           kmembase, kmemsize, PAGE_SIZE, NULL, NULL, NULL,
            0, VM_NOSLEEP | VM_BOOTSTRAP, IPL_VM);
 #ifdef PMAP_GROWKERNEL
        /*
@@ -342,15 +344,15 @@
        }
 #endif
 
-       vmem_init(kmem_arena);
+       vmem_subsystem_init(kmem_arena);
 
        UVMHIST_LOG(maphist, "kmem vmem created (base=%#"PRIxVADDR
            ", size=%#"PRIxVSIZE, kmembase, kmemsize, 0,0);
 
-       kmem_va_arena = vmem_create("kva", 0, 0, PAGE_SIZE,
-           vmem_alloc, vmem_free, kmem_arena,
-           (kmem_arena_small ? 4 : 8) * PAGE_SIZE,
-           VM_NOSLEEP | VM_BOOTSTRAP, IPL_VM);
+       kmem_va_arena = vmem_init(&kmem_va_arena_store, "kva",
+           0, 0, PAGE_SIZE, vmem_alloc, vmem_free, kmem_arena,
+           (kmem_arena_small ? 4 : VMEM_QCACHE_IDX_MAX) * PAGE_SIZE,
+           VM_NOSLEEP, IPL_VM);
 
        UVMHIST_LOG(maphist, "<- done", 0,0,0,0);
 }