CVS commit: src/sys

[matthew green]

Module Name:    src
Committed By:   mrg
Date:           Sun Jun 12 06:36:38 UTC 2011

Modified Files:
        src/sys/rump/librump/rumpkern: Makefile.rumpkern vm.c
        src/sys/uvm: uvm_object.c

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 src/sys/rump/librump/rumpkern/Makefile.rumpkern
cvs rdiff -u -r1.115 -r1.116 src/sys/rump/librump/rumpkern/vm.c
cvs rdiff -u -r1.8 -r1.9 src/sys/uvm/uvm_object.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.109 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.110
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.109	Thu May 19 21:24:55 2011
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern	Sun Jun 12 06:36:38 2011
@@ -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

Index: src/sys/rump/librump/rumpkern/vm.c
diff -u src/sys/rump/librump/rumpkern/vm.c:1.115 src/sys/rump/librump/rumpkern/vm.c:1.116
--- src/sys/rump/librump/rumpkern/vm.c:1.115	Sun Jun 12 03:35:59 2011
+++ src/sys/rump/librump/rumpkern/vm.c	Sun Jun 12 06:36:38 2011
@@ -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,

Index: src/sys/uvm/uvm_object.c
diff -u src/sys/uvm/uvm_object.c:1.8 src/sys/uvm/uvm_object.c:1.9
--- src/sys/uvm/uvm_object.c:1.8	Sun Jun 12 03:36:03 2011
+++ src/sys/uvm/uvm_object.c	Sun Jun 12 06:36:38 2011
@@ -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