 @@ -1,14 +1,14 @@
-/*	$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.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -16,27 +16,27 @@
  * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #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
 #include <sys/param.h>
 #include <sys/atomic.h>
 #include <sys/buf.h>
 #include <sys/callout.h>
 #include <sys/conf.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/evcnt.h>
 #include <sys/event.h>
 @@ -290,27 +290,26 @@ rump__init(int rump_version)
 	l->l_cpu = l->l_target_cpu = rump_cpu;
 	l->l_fd = &filedesc0;
 	rumpuser_set_curlwp(l);
 	rumpuser_mutex_init(&rump_giantlock);
 	ksyms_init();
 	uvm_init();
 	evcnt_init();
 	once_init();
 	kernconfig_lock_init();
 	prop_kern_init();
 	pool_subsystem_init();
 	kmem_init();
 	uvm_ra_init();
 	uao_init();
 	mutex_obj_init();
 	callout_startup();
 	kprintf_init();
 	loginit();
 	kauth_init();

 @@ -1,14 +1,14 @@
-/*	$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.
+ *
  * Development of this software was supported by
  * The Finnish Cultural Foundation and the Research Foundation of
  * The Helsinki University of Technology.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -31,27 +31,27 @@
 /*
  * Virtual memory emulation routines.
  */
 /*
  * XXX: we abuse pg->uanon for the virtual address of the storage
  * for each page.  phys_addr would fit the job description better,
  * except that it will create unnecessary lossage on some platforms
  * due to not being a pointer type.
  */
 #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>
 #include <sys/buf.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/vmem.h>
 #include <sys/mman.h>
 #include <sys/null.h>
 #include <sys/vnode.h>
 #include <machine/pmap.h>
 @@ -320,26 +320,27 @@ uvm_init(void)
 #undef FAKE_PAGE_SHIFT
 #endif
 	mutex_init(&pagermtx, MUTEX_DEFAULT, 0);
 	mutex_init(&uvm_pageqlock, MUTEX_DEFAULT, 0);
 	mutex_init(&uvm_swap_data_lock, MUTEX_DEFAULT, 0);
 	mutex_init(&pdaemonmtx, MUTEX_DEFAULT, 0);
 	cv_init(&pdaemoncv, "pdaemon");
 	cv_init(&oomwait, "oomwait");
 	kernel_map->pmap = pmap_kernel();
 	pool_subsystem_init();
 	vmem_bootstrap();
 	kmem_arena = vmem_create("kmem", 0, 1024*1024, PAGE_SIZE,
 	    NULL, NULL, NULL,
 , VM_NOSLEEP | VM_BOOTSTRAP, IPL_VM);
 	vmem_init(kmem_arena);
 	kmem_va_arena = vmem_create("kva", 0, 0, PAGE_SIZE,
 	    vmem_alloc, vmem_free, kmem_arena,
 * PAGE_SIZE, VM_NOSLEEP | VM_BOOTSTRAP, IPL_VM);
 	pool_cache_bootstrap(&pagecache, sizeof(struct vm_page), 0, 0, 0,
 	    "page$", NULL, IPL_NONE, pgctor, pgdtor, NULL);