[src/trunk]: src/sys/rump/librump/rumpkern regen

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

details:   https://anonhg.NetBSD.org/src/rev/68cdc06f8b7a
branches:  trunk
changeset: 785306:68cdc06f8b7a
user:      pooka <pooka%NetBSD.org@localhost>
date:      Thu Mar 07 19:18:08 2013 +0000

description:
regen

diffstat:

 sys/rump/librump/rumpkern/rump_syscalls.c |  17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diffs (41 lines):

diff -r a63a0c289f4c -r 68cdc06f8b7a sys/rump/librump/rumpkern/rump_syscalls.c
--- a/sys/rump/librump/rumpkern/rump_syscalls.c Thu Mar 07 19:17:46 2013 +0000
+++ b/sys/rump/librump/rumpkern/rump_syscalls.c Thu Mar 07 19:18:08 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_syscalls.c,v 1.85 2013/01/17 21:31:11 pooka Exp $ */
+/* $NetBSD: rump_syscalls.c,v 1.86 2013/03/07 19:18:08 pooka Exp $ */
 
 /*
  * System call vector and marshalling for rump.
@@ -15,7 +15,7 @@
 
 #ifdef __NetBSD__
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.85 2013/01/17 21:31:11 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.86 2013/03/07 19:18:08 pooka Exp $");
 
 #include <sys/fstypes.h>
 #include <sys/proc.h>
@@ -47,12 +47,19 @@
 static int
 rsys_syscall(int num, void *data, size_t dlen, register_t *retval)
 {
-       struct sysent *callp = rump_sysent + num;
+       struct proc *p;
+       struct emul *e;
+       struct sysent *callp;
        int rv;
 
-       KASSERT(num > 0 && num < SYS_NSYSENT);
-
        rump_schedule();
+       p = curproc;
+       e = p->p_emul;
+#ifndef __HAVE_MINIMAL_EMUL
+       KASSERT(num > 0 && num < e->e_nsysent);
+#endif
+       callp = e->e_sysent + num;
+
        rv = sy_call(callp, curlwp, data, retval);
        rump_unschedule();