Module Name: src
Committed By: pooka
Date: Tue Feb 18 06:18:13 UTC 2014
Modified Files:
src/sys/rump/librump/rumpkern: Makefile.rumpkern vm.c
src/sys/uvm: uvm_swapstub.c
Log Message:
Use same uvm_swap_shutdown() stub for !vmswap kernels and rump kernels.
To generate a diff of this commit:
cvs rdiff -u -r1.136 -r1.137 src/sys/rump/librump/rumpkern/Makefile.rumpkern
cvs rdiff -u -r1.148 -r1.149 src/sys/rump/librump/rumpkern/vm.c
cvs rdiff -u -r1.7 -r1.8 src/sys/uvm/uvm_swapstub.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/Makefile.rumpkern
diff -u src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.136 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.137
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.136 Wed Feb 12 22:28:43 2014
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern Tue Feb 18 06:18:13 2014
@@ -1,4 +1,4 @@
-# $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"
@@ -125,7 +125,7 @@ SRCS+= init_sysctl_base.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
Index: src/sys/rump/librump/rumpkern/vm.c
diff -u src/sys/rump/librump/rumpkern/vm.c:1.148 src/sys/rump/librump/rumpkern/vm.c:1.149
--- src/sys/rump/librump/rumpkern/vm.c:1.148 Mon Feb 17 19:43:52 2014
+++ src/sys/rump/librump/rumpkern/vm.c Tue Feb 18 06:18:13 2014
@@ -1,4 +1,4 @@
-/* $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.
@@ -41,7 +41,7 @@
*/
#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>
@@ -1199,8 +1199,3 @@ rump_hyperfree(void *what, size_t size)
}
rumpuser_free(what, size);
}
-
-void
-uvm_swap_shutdown(struct lwp *lwp)
-{
-}
Index: src/sys/uvm/uvm_swapstub.c
diff -u src/sys/uvm/uvm_swapstub.c:1.7 src/sys/uvm/uvm_swapstub.c:1.8
--- src/sys/uvm/uvm_swapstub.c:1.7 Wed Apr 27 00:35:52 2011
+++ src/sys/uvm/uvm_swapstub.c Tue Feb 18 06:18:13 2014
@@ -1,4 +1,4 @@
-/* $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,
@@ -31,7 +31,7 @@
*/
#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>
@@ -53,3 +53,10 @@ sys_swapctl(struct lwp *l, const struct
return ENOSYS;
}
+
+void
+uvm_swap_shutdown(struct lwp *l)
+{
+
+ /* nothing */
+}
