[src/trunk]: src/sys/rump/librump/rumpkern One emul is enough and since we ne...

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

details:   https://anonhg.NetBSD.org/src/rev/36fbcad1b0ef
branches:  trunk
changeset: 754040:36fbcad1b0ef
user:      pooka <pooka%NetBSD.org@localhost>
date:      Sat Apr 17 16:34:29 2010 +0000

description:
One emul is enough and since we need emul_netbsd, retire emul_rump.

diffstat:

 sys/rump/librump/rumpkern/emul.c |   5 +++--
 sys/rump/librump/rumpkern/rump.c |  11 ++++-------
 2 files changed, 7 insertions(+), 9 deletions(-)

diffs (72 lines):

diff -r 929e3da97d2e -r 36fbcad1b0ef sys/rump/librump/rumpkern/emul.c
--- a/sys/rump/librump/rumpkern/emul.c  Sat Apr 17 15:57:48 2010 +0000
+++ b/sys/rump/librump/rumpkern/emul.c  Sat Apr 17 16:34:29 2010 +0000
@@ -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 *
diff -r 929e3da97d2e -r 36fbcad1b0ef sys/rump/librump/rumpkern/rump.c
--- a/sys/rump/librump/rumpkern/rump.c  Sat Apr 17 15:57:48 2010 +0000
+++ b/sys/rump/librump/rumpkern/rump.c  Sat Apr 17 16:34:29 2010 +0000
@@ -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();