Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

include uvm_object.c in the rump kernel for the new uvm_obj* functions.

Browse Source 
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.
This commit is contained in:
mrg 2011-06-12 06:36:38 +00:00
parent 08d84f24b2
commit a14dae9853
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/rump/librump/rumpkern/Makefile.rumpkern
View File

@ -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 @@ SRCS+= init_sysctl_base.c \
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

18
sys/rump/librump/rumpkern/vm.c
View File

@ -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 @@ uvm_loanuobjpages(struct uvm_object *uobj, voff_t pgoff, int orignpages,
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,

6
sys/uvm/uvm_object.c
View File

@ -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 @@ uvm_obj_unwirepages(struct uvm_object *uobj, off_t start, off_t end)
mutex_exit(uobj->vmobjlock);
}
#if defined(DDB) || defined(DEBUGPRINT)
#if (defined(DDB) || defined(DEBUGPRINT)) && !defined(_RUMPKERNEL)
/*
* uvm_object_printit: actually prints the object