 @@ -1,14 +1,14 @@
-#	$NetBSD: Makefile.rumpkern,v 1.40 2009/01/30 02:30:03 pooka Exp $
+#	$NetBSD: Makefile.rumpkern,v 1.41 2009/03/18 17:56:15 pooka Exp $
+#
 .include "${RUMPTOP}/Makefile.rump"
 LIB=		rump
 .PATH:	${RUMPTOP}/librump/rumpkern				\
 	${RUMPTOP}/../kern					\
 	${RUMPTOP}/../conf					\
 	${RUMPTOP}/../dev
+#
 # Source modules, first the ones specifically implemented for librump.
 @@ -17,30 +17,30 @@ SRCS=	rump.c emul.c intr.c locks.c ltsle
 # stubs
+#
 SRCS+=	misc_stub.c pmap_stub.c
 # autogenerated
+#
 SRCS+=	rump_syscalls.c
+#
 # Rest are from the std kernel sources.
+#
 # sys/kern
-SRCS+=	kern_auth.c kern_descrip.c kern_ksyms.c kern_malloc_stdtype.c	\
+SRCS+=	kern_auth.c kern_descrip.c kern_event.c kern_ksyms.c		\
-	kern_module.c kern_rate.c kern_stub.c kern_sysctl.c		\
+	kern_malloc_stdtype.c kern_module.c kern_rate.c kern_stub.c	\
-	kern_timeout.c kern_uidinfo.c param.c sys_descrip.c		\
+	kern_sysctl.c kern_timeout.c kern_uidinfo.c param.c		\
-	sys_generic.c
+	sys_descrip.c sys_generic.c
 # sys/kern subr (misc)
 SRCS+=	subr_devsw.c subr_callback.c subr_hash.c subr_iostat.c		\
 	subr_kobj.c subr_log.c subr_once.c subr_prf.c			\
 	subr_specificdata.c subr_time.c subr_workqueue.c
 # the funny bit.  this doesn't really belong here, but helps with the
 # needs of kern_descrip.c.  And since it's a fully dynamic interface,
 # it doesn't pull in other gunk.
 SRCS+=	vnode_if.c
 # sys/dev
 SRCS+=	clock_subr.c

 @@ -1,14 +1,14 @@
-/*	$NetBSD: emul.c,v 1.80 2009/03/18 10:22:44 cegger Exp $	*/
+/*	$NetBSD: emul.c,v 1.81 2009/03/18 17:56:15 pooka Exp $	*/
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
+ *
  * Development of this software was supported by Google Summer of Code.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -18,27 +18,27 @@
  * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.80 2009/03/18 10:22:44 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.81 2009/03/18 17:56:15 pooka Exp $");
 #include <sys/param.h>
 #include <sys/malloc.h>
 #include <sys/null.h>
 #include <sys/vnode.h>
 #include <sys/stat.h>
 #include <sys/select.h>
 #include <sys/syslog.h>
 #include <sys/namei.h>
 #include <sys/kauth.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/queue.h>
 @@ -91,26 +91,27 @@ u_long	bufmem_valimit;
 u_long	bufmem_hiwater;
 u_long	bufmem_lowater;
 u_long	bufmem;
 u_int	nbuf;
 const char *panicstr;
 const char ostype[] = "NetBSD";
 const char osrelease[] = "999"; /* paradroid 4evah */
 const char kernel_ident[] = "RUMP-ROAST";
 const char *domainname;
 int domainnamelen;
 const struct filterops seltrue_filtops;
 const struct filterops sig_filtops;
 #define DEVSW_SIZE 255
 const struct bdevsw *bdevsw0[DEVSW_SIZE]; /* XXX storage size */
 const struct bdevsw **bdevsw = bdevsw0;
 const int sys_cdevsws = DEVSW_SIZE;
 int max_cdevsws = DEVSW_SIZE;
 const struct cdevsw *cdevsw0[DEVSW_SIZE]; /* XXX storage size */
 const struct cdevsw **cdevsw = cdevsw0;
 const int sys_bdevsws = DEVSW_SIZE;
 int max_bdevsws = DEVSW_SIZE;
 struct devsw_conv devsw_conv0;
 @@ -144,26 +145,36 @@ copystr(const void *kfaddr, void *kdaddr
+}
 int
 copyinstr(const void *uaddr, void *kaddr, size_t len, size_t *done)
+{
 	strlcpy(kaddr, uaddr, len);
 	if (done)
 		*done = strlen(kaddr)+1; /* includes termination */
 	return 0;
+}
 int
 copyoutstr(const void *kaddr, void *uaddr, size_t len, size_t *done)
+{
 	strlcpy(uaddr, kaddr, len);
 	if (done)
 		*done = strlen(uaddr)+1; /* includes termination */
 	return 0;
+}
 int
 copyin_vmspace(struct vmspace *vm, const void *uaddr, void *kaddr, size_t len)
+{
 	return copyin(uaddr, kaddr, len);
+}
 int
 copyout_vmspace(struct vmspace *vm, const void *kaddr, void *uaddr, size_t len)
+{
 	return copyout(kaddr, uaddr, len);
+}
 @@ -483,40 +494,26 @@ int
 sigispending(struct lwp *l, int signo)
+{
 	return 0;
+}
 void
 sigpending1(struct lwp *l, sigset_t *ss)
+{
 	panic("%s: not implemented", __func__);
+}
 void
 knote_fdclose(int fd)
 	/* since we don't add knotes, we don't have to remove them */
 int
 seltrue_kqfilter(dev_t dev, struct knote *kn)
 	panic("%s: not implemented", __func__);
 int
 kpause(const char *wmesg, bool intr, int timeo, kmutex_t *mtx)
+{
 	extern int hz;
 	int rv, error;
 	uint64_t sec, nsec;
 	if (mtx)
 		mutex_exit(mtx);
 	sec = timeo / hz;
 	nsec = (timeo % hz) * (1000000000 / hz);
 	rv = rumpuser_nanosleep(&sec, &nsec, &error);
 @@ -700,13 +697,46 @@ tputchar(int c, int flags, struct tty *t
 void
 cpu_reboot(int howto, char *bootstr)
+{
 	rumpuser_panic();
+}
 /* XXX: static, but not used except to make spcopy.S link */
 #ifdef __hppa__
 #undef curlwp
 struct lwp *curlwp = &lwp0;
 #endif
 /*
  * XXX: from sys_select.c, see that file for license.
  * (these will go away really soon in favour of the real sys_select.c)
  * ((really, the select code just needs cleanup))
  * (((seriously)))
  */
 int
 inittimeleft(struct timeval *tv, struct timeval *sleeptv)
+{
 	if (itimerfix(tv))
 		return -1;
 	getmicrouptime(sleeptv);
 	return 0;
+}
 int
 gettimeleft(struct timeval *tv, struct timeval *sleeptv)
+{
 	/*
 	 * We have to recalculate the timeout on every retry.
 	 */
 	struct timeval slepttv;
 	/*
 	 * reduce tv by elapsed time
 	 * based on monotonic time scale
 	 */
 	getmicrouptime(&slepttv);
 	timeradd(tv, sleeptv, tv);
 	timersub(tv, &slepttv, tv);
 	*sleeptv = slepttv;
 	return tvtohz(tv);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: misc_stub.c,v 1.18 2009/03/18 10:22:44 cegger Exp $	*/
+/*	$NetBSD: misc_stub.c,v 1.19 2009/03/18 17:56:15 pooka Exp $	*/
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
+ *
  * Development of this software was supported by Google Summer of Code.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -18,27 +18,27 @@
  * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: misc_stub.c,v 1.18 2009/03/18 10:22:44 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: misc_stub.c,v 1.19 2009/03/18 17:56:15 pooka Exp $");
 #include <sys/param.h>
 #include <sys/cpu.h>
 #include <sys/evcnt.h>
 #include <sys/event.h>
 #include <sys/sched.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
 #include <sys/syscallvar.h>
 #include <sys/xcall.h>
 #ifdef __sparc__
  /*
 @@ -57,33 +57,26 @@ yield(void)
 	 * scheduled anyway.
 	 */
 	return;
+}
 void
 preempt(void)
+{
 	/* see yield */
 	return;
+}
 void
 knote(struct klist *list, long hint)
 	return;
 struct cpu_info *
 cpu_lookup(u_int index)
+{
 	extern struct cpu_info rump_cpu;
 	return &rump_cpu;
+}
 void
 evcnt_attach_dynamic(struct evcnt *ev, int type, const struct evcnt *parent,
     const char *group, const char *name)
+{