Module Name: src
Committed By: pooka
Date: Sat Apr 17 16:34:29 UTC 2010
Modified Files:
src/sys/rump/librump/rumpkern: emul.c rump.c
Log Message:
One emul is enough and since we need emul_netbsd, retire emul_rump.
To generate a diff of this commit:
cvs rdiff -u -r1.127 -r1.128 src/sys/rump/librump/rumpkern/emul.c
cvs rdiff -u -r1.160 -r1.161 src/sys/rump/librump/rumpkern/rump.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/emul.c
diff -u src/sys/rump/librump/rumpkern/emul.c:1.127 src/sys/rump/librump/rumpkern/emul.c:1.128
--- src/sys/rump/librump/rumpkern/emul.c:1.127 Sat Apr 17 13:13:45 2010
+++ src/sys/rump/librump/rumpkern/emul.c Sat Apr 17 16:34:29 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: emul.c,v 1.127 2010/04/17 13:13:45 pooka Exp $ */
+/* $NetBSD: emul.c,v 1.128 2010/04/17 16:34:29 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.127 2010/04/17 13:13:45 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.128 2010/04/17 16:34:29 pooka Exp $");
#include <sys/param.h>
#include <sys/null.h>
@@ -126,6 +126,7 @@
struct emul emul_netbsd = {
.e_name = "netbsd-rump",
.e_sysent = rump_sysent,
+ .e_vm_default_addr = uvm_default_mapaddr,
};
struct proc *
Index: src/sys/rump/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.160 src/sys/rump/librump/rumpkern/rump.c:1.161
--- src/sys/rump/librump/rumpkern/rump.c:1.160 Wed Apr 14 10:27:53 2010
+++ src/sys/rump/librump/rumpkern/rump.c Sat Apr 17 16:34:29 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.c,v 1.160 2010/04/14 10:27:53 pooka Exp $ */
+/* $NetBSD: rump.c,v 1.161 2010/04/17 16:34:29 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.160 2010/04/14 10:27:53 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.161 2010/04/17 16:34:29 pooka Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -126,9 +126,6 @@
}
static int rump_inited;
-static struct emul emul_rump = {
- .e_vm_default_addr = uvm_default_mapaddr,
-};
int rump__unavailable(void);
int rump__unavailable() {return EOPNOTSUPP;}
@@ -272,7 +269,7 @@
p->p_pid = 0;
p->p_fd = &rump_filedesc0;
p->p_vmspace = &rump_vmspace;
- p->p_emul = &emul_rump;
+ p->p_emul = &emul_netbsd;
p->p_lock = mutex_obj_alloc(MUTEX_DEFAULT, IPL_NONE);
l->l_cred = rump_cred_suserget();
l->l_proc = p;
@@ -485,7 +482,7 @@
p->p_limit = &rump_limits;
p->p_pid = pid;
p->p_vmspace = &rump_vmspace;
- p->p_emul = &emul_rump;
+ p->p_emul = &emul_netbsd;
p->p_fd = fd_init(NULL);
p->p_lock = mutex_obj_alloc(MUTEX_DEFAULT, IPL_NONE);
l->l_cred = rump_cred_suserget();
