[src/trunk]: src/sys Use same uvm_swap_shutdown() stub for !vmswap kernels an...

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/047a76811ab7
branches:  trunk
changeset: 326793:047a76811ab7
user:      pooka <pooka%NetBSD.org@localhost>
date:      Tue Feb 18 06:18:13 2014 +0000

description:
Use same uvm_swap_shutdown() stub for !vmswap kernels and rump kernels.

diffstat:

 sys/rump/librump/rumpkern/Makefile.rumpkern |   4 ++--
 sys/rump/librump/rumpkern/vm.c              |   9 ++-------
 sys/uvm/uvm_swapstub.c                      |  11 +++++++++--
 3 files changed, 13 insertions(+), 11 deletions(-)

diffs (74 lines):

diff -r 1b336705b5f7 -r 047a76811ab7 sys/rump/librump/rumpkern/Makefile.rumpkern
--- a/sys/rump/librump/rumpkern/Makefile.rumpkern       Tue Feb 18 01:34:18 2014 +0000
+++ b/sys/rump/librump/rumpkern/Makefile.rumpkern       Tue Feb 18 06:18:13 2014 +0000
@@ -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 @@
        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
diff -r 1b336705b5f7 -r 047a76811ab7 sys/rump/librump/rumpkern/vm.c
--- a/sys/rump/librump/rumpkern/vm.c    Tue Feb 18 01:34:18 2014 +0000
+++ b/sys/rump/librump/rumpkern/vm.c    Tue Feb 18 06:18:13 2014 +0000
@@ -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 @@
        }
        rumpuser_free(what, size);
 }
-
-void
-uvm_swap_shutdown(struct lwp *lwp)
-{
-}
diff -r 1b336705b5f7 -r 047a76811ab7 sys/uvm/uvm_swapstub.c
--- a/sys/uvm/uvm_swapstub.c    Tue Feb 18 01:34:18 2014 +0000
+++ b/sys/uvm/uvm_swapstub.c    Tue Feb 18 06:18:13 2014 +0000
@@ -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 @@
 
        return ENOSYS;
 }
+
+void
+uvm_swap_shutdown(struct lwp *l)
+{
+
+       /* nothing */
+}