Module Name: src
Committed By: pooka
Date: Fri Dec 4 16:47:33 UTC 2009
Modified Files:
src/sys/rump/librump/rumpkern: rump.c vm.c
Log Message:
Provide the default_mapaddr method in default rump emul (since some
kernel callers want to use it).
To generate a diff of this commit:
cvs rdiff -u -r1.144 -r1.145 src/sys/rump/librump/rumpkern/rump.c
cvs rdiff -u -r1.67 -r1.68 src/sys/rump/librump/rumpkern/vm.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/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.144 src/sys/rump/librump/rumpkern/rump.c:1.145
--- src/sys/rump/librump/rumpkern/rump.c:1.144 Thu Dec 3 12:35:34 2009
+++ src/sys/rump/librump/rumpkern/rump.c Fri Dec 4 16:47:33 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.c,v 1.144 2009/12/03 12:35:34 pooka Exp $ */
+/* $NetBSD: rump.c,v 1.145 2009/12/04 16:47:33 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.144 2009/12/03 12:35:34 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.145 2009/12/04 16:47:33 pooka Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -123,7 +123,9 @@
}
static int rump_inited;
-static struct emul emul_rump;
+static struct emul emul_rump = {
+ .e_vm_default_addr = uvm_default_mapaddr,
+};
int rump__unavailable(void);
int rump__unavailable() {return EOPNOTSUPP;}
@@ -455,6 +457,7 @@
p->p_limit = &rump_limits;
p->p_pid = pid;
p->p_vmspace = &rump_vmspace;
+ p->p_emul = &emul_rump;
p->p_fd = fd_init(NULL);
p->p_lock = mutex_obj_alloc(MUTEX_DEFAULT, IPL_NONE);
l->l_cred = rump_cred_suserget();
Index: src/sys/rump/librump/rumpkern/vm.c
diff -u src/sys/rump/librump/rumpkern/vm.c:1.67 src/sys/rump/librump/rumpkern/vm.c:1.68
--- src/sys/rump/librump/rumpkern/vm.c:1.67 Wed Nov 4 18:25:36 2009
+++ src/sys/rump/librump/rumpkern/vm.c Fri Dec 4 16:47:33 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vm.c,v 1.67 2009/11/04 18:25:36 pooka Exp $ */
+/* $NetBSD: vm.c,v 1.68 2009/12/04 16:47:33 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.67 2009/11/04 18:25:36 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.68 2009/12/04 16:47:33 pooka Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -251,7 +251,6 @@
}
-
void
uvm_pagewire(struct vm_page *pg)
{
@@ -502,6 +501,13 @@
/* nada for now */
}
+vaddr_t
+uvm_default_mapaddr(struct proc *p, vaddr_t base, vsize_t sz)
+{
+
+ return 0;
+}
+
/*
* UVM km
*/
