 @@ -1,14 +1,14 @@
-#	$NetBSD: Makefile.rumpkern,v 1.136 2014/02/12 22:28:43 pooka Exp $
+#	$NetBSD: Makefile.rumpkern,v 1.137 2014/02/18 06:18:13 pooka Exp $
+#
 .include "${RUMPTOP}/Makefile.rump"
 .include <bsd.own.mk>
 LIB=		rump
 .PATH:	${RUMPTOP}/librump/rumpkern				\
 	${RUMPTOP}/librump/rumpkern/arch/generic		\
 	${RUMPTOP}/../kern					\
 	${RUMPTOP}/../uvm					\
 	${RUMPTOP}/../conf					\
 @@ -115,27 +115,27 @@ SRCS+=	init_sysctl_base.c	\
 	subr_time.c		\
 	subr_vmem.c		\
 	subr_workqueue.c	\
 	subr_xcall.c		\
 	sys_descrip.c		\
 	sys_generic.c		\
 	sys_module.c		\
 	sys_pipe.c		\
 	sys_select.c		\
 	syscalls.c		\
 	uipc_sem.c
 # sys/uvm
-SRCS+=	uvm_aobj.c uvm_readahead.c uvm_object.c
+SRCS+=	uvm_aobj.c uvm_readahead.c uvm_object.c uvm_swapstub.c
 # 4.4BSD secmodel.  selection is hardcoded for now
 SRCS+=	secmodel.c
 SRCS+=	secmodel_suser.c
 # the funny bit.  this doesn't really belong here, but helps with the
 # needs of kern_descrip.c.  And since it's a fully dynamic interface,
 # it doesn't pull in other gunk.
 SRCS+=	vnode_if.c
 # sys/dev
 SRCS+=	clock_subr.c

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vm.c,v 1.148 2014/02/17 19:43:52 pooka Exp $	*/
+/*	$NetBSD: vm.c,v 1.149 2014/02/18 06:18:13 pooka 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.148 2014/02/17 19:43:52 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.149 2014/02/18 06:18:13 pooka 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>
 @@ -1189,18 +1189,13 @@ rump_hypermalloc(size_t howmuch, int ali
 	return rv;
+}
 void
 rump_hyperfree(void *what, size_t size)
+{
 	if (rump_physmemlimit != RUMPMEM_UNLIMITED) {
 		atomic_add_long(&curphysmem, -size);
+	}
 	rumpuser_free(what, size);
+}
 void
 uvm_swap_shutdown(struct lwp *lwp)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: uvm_swapstub.c,v 1.7 2011/04/27 00:35:52 rmind Exp $	*/
+/*	$NetBSD: uvm_swapstub.c,v 1.8 2014/02/18 06:18:13 pooka Exp $	*/
 /*-
  * Copyright (c)2005 YAMAMOTO Takashi,
  * 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.
 @@ -21,35 +21,42 @@
  * 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.
  */
 /*
  * Dummy routines used when "options VMSWAP" is not configured.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_swapstub.c,v 1.7 2011/04/27 00:35:52 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_swapstub.c,v 1.8 2014/02/18 06:18:13 pooka Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mount.h>
 #include <sys/syscallargs.h>
 #include <uvm/uvm.h>
 void
 uvm_swap_init(void)
+{
 	/* nothing */
+}
 int
 sys_swapctl(struct lwp *l, const struct sys_swapctl_args *v, register_t *retval)
+{
 	return ENOSYS;
+}
 void
 uvm_swap_shutdown(struct lwp *l)
+{
 	/* nothing */
+}