CVS commit: src/sys/uvm

[Lars Heidieker]

Module Name:    src
Committed By:   para
Date:           Tue Jan 29 21:29:41 UTC 2013

Modified Files:
        src/sys/uvm: uvm_km.c

Log Message:
bring file up to date for previous vmem changes.


To generate a diff of this commit:
cvs rdiff -u -r1.137 -r1.138 src/sys/uvm/uvm_km.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/uvm/uvm_km.c
diff -u src/sys/uvm/uvm_km.c:1.137 src/sys/uvm/uvm_km.c:1.138
--- src/sys/uvm/uvm_km.c:1.137	Sat Jan 26 15:18:01 2013
+++ src/sys/uvm/uvm_km.c	Tue Jan 29 21:29:40 2013
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: uvm_km.c,v 1
 #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 @@ int nkmempages = 0;
 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 @@ uvm_km_bootstrap(vaddr_t start, vaddr_t 
 	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 @@ uvm_km_bootstrap(vaddr_t start, vaddr_t 
 	}
 #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);
 }