[src/trunk]: src/sys include uvm_object.c in the rump kernel for the new uvm_...

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

details:   https://anonhg.NetBSD.org/src/rev/d92449ec151b
branches:  trunk
changeset: 765982:d92449ec151b
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Jun 12 06:36:38 2011 +0000

description:
include uvm_object.c in the rump kernel for the new uvm_obj* functions.
don't build the uvm_object.c uvm_object_printit() for _RUMPKERNEL. (XXX)
add empty panic() stubs for uvm_loanbreak() and ubc_purge().

fixes some more 5.99.53 rump build issues.

diffstat:

 sys/rump/librump/rumpkern/Makefile.rumpkern |   4 ++--
 sys/rump/librump/rumpkern/vm.c              |  18 ++++++++++++++++--
 sys/uvm/uvm_object.c                        |   6 +++---
 3 files changed, 21 insertions(+), 7 deletions(-)

diffs (84 lines):

diff -r 4dc68ba0b84e -r d92449ec151b sys/rump/librump/rumpkern/Makefile.rumpkern
--- a/sys/rump/librump/rumpkern/Makefile.rumpkern       Sun Jun 12 06:34:59 2011 +0000
+++ b/sys/rump/librump/rumpkern/Makefile.rumpkern       Sun Jun 12 06:36:38 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.rumpkern,v 1.109 2011/05/19 21:24:55 joerg Exp $
+#      $NetBSD: Makefile.rumpkern,v 1.110 2011/06/12 06:36:38 mrg Exp $
 #
 
 .include "${RUMPTOP}/Makefile.rump"
@@ -106,7 +106,7 @@
        syscalls.c
 
 # sys/uvm
-SRCS+= uvm_aobj.c uvm_readahead.c
+SRCS+= uvm_aobj.c uvm_readahead.c uvm_object.c
 
 # 4.4BSD secmodel.  selection is hardcoded for now
 SRCS+= secmodel_suser.c
diff -r 4dc68ba0b84e -r d92449ec151b sys/rump/librump/rumpkern/vm.c
--- a/sys/rump/librump/rumpkern/vm.c    Sun Jun 12 06:34:59 2011 +0000
+++ b/sys/rump/librump/rumpkern/vm.c    Sun Jun 12 06:36:38 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vm.c,v 1.115 2011/06/12 03:35:59 rmind Exp $   */
+/*     $NetBSD: vm.c,v 1.116 2011/06/12 06:36:38 mrg 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.115 2011/06/12 03:35:59 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.116 2011/06/12 06:36:38 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/atomic.h>
@@ -634,6 +634,20 @@
        return EBUSY;
 }
 
+struct vm_page *
+uvm_loanbreak(struct vm_page *pg)
+{
+
+       panic("%s: unimplemented", __func__);
+}
+
+void
+ubc_purge(struct uvm_object *uobj)
+{
+
+       panic("%s: unimplemented", __func__);
+}
+
 #ifdef DEBUGPRINT
 void
 uvm_object_printit(struct uvm_object *uobj, bool full,
diff -r 4dc68ba0b84e -r d92449ec151b sys/uvm/uvm_object.c
--- a/sys/uvm/uvm_object.c      Sun Jun 12 06:34:59 2011 +0000
+++ b/sys/uvm/uvm_object.c      Sun Jun 12 06:36:38 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_object.c,v 1.8 2011/06/12 03:36:03 rmind Exp $     */
+/*     $NetBSD: uvm_object.c,v 1.9 2011/06/12 06:36:38 mrg Exp $       */
 
 /*
  * Copyright (c) 2006, 2010 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_object.c,v 1.8 2011/06/12 03:36:03 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_object.c,v 1.9 2011/06/12 06:36:38 mrg Exp $");
 
 #include "opt_ddb.h"
 
@@ -225,7 +225,7 @@
        mutex_exit(uobj->vmobjlock);
 }
 
-#if defined(DDB) || defined(DEBUGPRINT)
+#if (defined(DDB) || defined(DEBUGPRINT)) && !defined(_RUMPKERNEL)
 
 /*
  * uvm_object_printit: actually prints the object