[src/trunk]: src/sys/rump/librump/rumpkern Use kern_syscall.c instead of home...

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

details:   https://anonhg.NetBSD.org/src/rev/3ccc09aac97d
branches:  trunk
changeset: 753957:3ccc09aac97d
user:      pooka <pooka%NetBSD.org@localhost>
date:      Wed Apr 14 14:49:05 2010 +0000

description:
Use kern_syscall.c instead of homegrown syscall dis/establishment routines.

diffstat:

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

diffs (87 lines):

diff -r 0b4270eae7b0 -r 3ccc09aac97d sys/rump/librump/rumpkern/Makefile.rumpkern
--- a/sys/rump/librump/rumpkern/Makefile.rumpkern       Wed Apr 14 14:46:59 2010 +0000
+++ b/sys/rump/librump/rumpkern/Makefile.rumpkern       Wed Apr 14 14:49:05 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.rumpkern,v 1.76 2010/04/14 10:27:53 pooka Exp $
+#      $NetBSD: Makefile.rumpkern,v 1.77 2010/04/14 14:49:05 pooka Exp $
 #
 
 .include "${RUMPTOP}/Makefile.rump"
@@ -40,8 +40,9 @@
 SRCS+= init_sysctl_base.c kern_auth.c kern_descrip.c kern_event.c      \
        kern_hook.c kern_ksyms.c kern_malloc_stdtype.c kern_module.c    \
        kern_mutex_obj.c kern_ntptime.c kern_rate.c kern_stub.c         \
-       kern_sysctl.c kern_tc.c kern_timeout.c kern_uidinfo.c param.c   \
-       sys_descrip.c sys_generic.c sys_pipe.c sys_select.c syscalls.c
+       kern_syscall.c kern_sysctl.c kern_tc.c kern_timeout.c           \
+       kern_uidinfo.c param.c sys_descrip.c sys_generic.c sys_pipe.c   \
+       sys_select.c syscalls.c
 
 # sys/kern subr (misc)
 SRCS+= subr_devsw.c subr_callback.c subr_copy.c subr_device.c          \
diff -r 0b4270eae7b0 -r 3ccc09aac97d sys/rump/librump/rumpkern/emul.c
--- a/sys/rump/librump/rumpkern/emul.c  Wed Apr 14 14:46:59 2010 +0000
+++ b/sys/rump/librump/rumpkern/emul.c  Wed Apr 14 14:49:05 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: emul.c,v 1.125 2010/04/14 10:27:53 pooka Exp $ */
+/*     $NetBSD: emul.c,v 1.126 2010/04/14 14:49:05 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.125 2010/04/14 10:27:53 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.126 2010/04/14 14:49:05 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/null.h>
@@ -72,7 +72,6 @@
 int hardclock_ticks;
 bool mp_online = false;
 struct timeval boottime;
-struct emul emul_netbsd;
 int cold = 1;
 int boothowto = AB_SILENT;
 struct tty *constty;
@@ -124,6 +123,11 @@
        FSCALE,
 };
 
+struct emul emul_netbsd = {
+       .e_name = "netbsd-rump",
+       .e_sysent = rump_sysent,
+};
+
 struct proc *
 p_find(pid_t pid, uint flags)
 {
@@ -387,27 +391,6 @@
        rumpuser_exit(0);
 }
 
-int
-syscall_establish(const struct emul *em, const struct syscall_package *sp)
-{
-       extern struct sysent rump_sysent[];
-       int i;
-
-       KASSERT(em == NULL || em == &emul_netbsd);
-
-       for (i = 0; sp[i].sp_call; i++)
-               rump_sysent[sp[i].sp_code].sy_call = sp[i].sp_call;
-
-       return 0;
-}
-
-int
-syscall_disestablish(const struct emul *em, const struct syscall_package *sp)
-{
-
-       return 0;
-}
-
 void
 calcru(struct proc *p, struct timeval *up, struct timeval *sp,
        struct timeval *ip, struct timeval *rp)