Module Name: src
Committed By: njoly
Date: Sun Jan 29 14:57:32 UTC 2012
Modified Files:
src/sys/rump/librump/rumpkern: rump.c vm.c
Log Message:
Move pool subsystem init from rump__init() to uvm_init(), following
kernel code. Fix RUMP_LOCKDEBUG early panic.
To generate a diff of this commit:
cvs rdiff -u -r1.238 -r1.239 src/sys/rump/librump/rumpkern/rump.c
cvs rdiff -u -r1.121 -r1.122 src/sys/rump/librump/rumpkern/vm.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/rump/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.238 src/sys/rump/librump/rumpkern/rump.c:1.239
--- src/sys/rump/librump/rumpkern/rump.c:1.238 Sun Dec 4 19:24:59 2011
+++ src/sys/rump/librump/rumpkern/rump.c Sun Jan 29 14:57:31 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.c,v 1.238 2011/12/04 19:24:59 jym Exp $ */
+/* $NetBSD: rump.c,v 1.239 2012/01/29 14:57:31 njoly Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.238 2011/12/04 19:24:59 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.239 2012/01/29 14:57:31 njoly Exp $");
#include <sys/systm.h>
#define ELFSIZE ARCH_ELFSIZE
@@ -300,7 +300,6 @@ rump__init(int rump_version)
kernconfig_lock_init();
prop_kern_init();
- pool_subsystem_init();
kmem_init();
uvm_ra_init();
Index: src/sys/rump/librump/rumpkern/vm.c
diff -u src/sys/rump/librump/rumpkern/vm.c:1.121 src/sys/rump/librump/rumpkern/vm.c:1.122
--- src/sys/rump/librump/rumpkern/vm.c:1.121 Fri Jan 27 19:48:41 2012
+++ src/sys/rump/librump/rumpkern/vm.c Sun Jan 29 14:57:31 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: vm.c,v 1.121 2012/01/27 19:48:41 para Exp $ */
+/* $NetBSD: vm.c,v 1.122 2012/01/29 14:57:31 njoly Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.121 2012/01/27 19:48:41 para Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.122 2012/01/29 14:57:31 njoly Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -330,6 +330,7 @@ uvm_init(void)
kernel_map->pmap = pmap_kernel();
+ pool_subsystem_init();
vmem_bootstrap();
kmem_arena = vmem_create("kmem", 0, 1024*1024, PAGE_SIZE,
NULL, NULL, NULL,
