Module Name: src
Committed By: pooka
Date: Sun Mar 29 18:22:08 UTC 2009
Modified Files:
src/sys/rump/librump/rumpkern: Makefile.rumpkern misc_stub.c rump.c
Log Message:
include subr_evcnt
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/rump/librump/rumpkern/Makefile.rumpkern
cvs rdiff -u -r1.20 -r1.21 src/sys/rump/librump/rumpkern/misc_stub.c
cvs rdiff -u -r1.99 -r1.100 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/Makefile.rumpkern
diff -u src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.41 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.42
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.41 Wed Mar 18 17:56:15 2009
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern Sun Mar 29 18:22:08 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpkern,v 1.41 2009/03/18 17:56:15 pooka Exp $
+# $NetBSD: Makefile.rumpkern,v 1.42 2009/03/29 18:22:08 pooka Exp $
#
.include "${RUMPTOP}/Makefile.rump"
@@ -33,8 +33,8 @@
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 \
+SRCS+= subr_devsw.c subr_callback.c subr_evcnt.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
Index: src/sys/rump/librump/rumpkern/misc_stub.c
diff -u src/sys/rump/librump/rumpkern/misc_stub.c:1.20 src/sys/rump/librump/rumpkern/misc_stub.c:1.21
--- src/sys/rump/librump/rumpkern/misc_stub.c:1.20 Thu Mar 19 09:36:38 2009
+++ src/sys/rump/librump/rumpkern/misc_stub.c Sun Mar 29 18:22:08 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: misc_stub.c,v 1.20 2009/03/19 09:36:38 pooka Exp $ */
+/* $NetBSD: misc_stub.c,v 1.21 2009/03/29 18:22:08 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: misc_stub.c,v 1.20 2009/03/19 09:36:38 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: misc_stub.c,v 1.21 2009/03/29 18:22:08 pooka Exp $");
#include <sys/param.h>
#include <sys/cpu.h>
@@ -75,19 +75,6 @@
return &rump_cpu;
}
-void
-evcnt_attach_dynamic(struct evcnt *ev, int type, const struct evcnt *parent,
- const char *group, const char *name)
-{
-
-}
-
-void
-evcnt_detach(struct evcnt *ev)
-{
-
-}
-
int
syscall_establish(const struct emul *em, const struct syscall_package *sp)
{
Index: src/sys/rump/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.99 src/sys/rump/librump/rumpkern/rump.c:1.100
--- src/sys/rump/librump/rumpkern/rump.c:1.99 Thu Mar 19 09:14:37 2009
+++ src/sys/rump/librump/rumpkern/rump.c Sun Mar 29 18:22:08 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.c,v 1.99 2009/03/19 09:14:37 pooka Exp $ */
+/* $NetBSD: rump.c,v 1.100 2009/03/29 18:22:08 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.99 2009/03/19 09:14:37 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.100 2009/03/29 18:22:08 pooka Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -36,6 +36,7 @@
#include <sys/callout.h>
#include <sys/conf.h>
#include <sys/cpu.h>
+#include <sys/evcnt.h>
#include <sys/event.h>
#include <sys/filedesc.h>
#include <sys/iostat.h>
@@ -162,6 +163,7 @@
rumpuser_mutex_recursive_init(&rump_giantlock);
ksyms_init();
rumpvm_init();
+ evcnt_init();
once_init();
