Module Name: src
Committed By: pooka
Date: Sat Jun 12 07:13:54 UTC 2010
Modified Files:
src/sys/rump/librump/rumpkern: rump.c rump_private.h
Log Message:
Support rumpkern components and rumpkern components depending on vfs init.
To generate a diff of this commit:
cvs rdiff -u -r1.178 -r1.179 src/sys/rump/librump/rumpkern/rump.c
cvs rdiff -u -r1.51 -r1.52 src/sys/rump/librump/rumpkern/rump_private.h
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/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.178 src/sys/rump/librump/rumpkern/rump.c:1.179
--- src/sys/rump/librump/rumpkern/rump.c:1.178 Thu Jun 10 21:40:42 2010
+++ src/sys/rump/librump/rumpkern/rump.c Sat Jun 12 07:13:54 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.c,v 1.178 2010/06/10 21:40:42 pooka Exp $ */
+/* $NetBSD: rump.c,v 1.179 2010/06/12 07:13:54 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.178 2010/06/10 21:40:42 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.179 2010/06/12 07:13:54 pooka Exp $");
#include <sys/systm.h>
#define ELFSIZE ARCH_ELFSIZE
@@ -358,10 +358,15 @@
/* process dso's */
rumpuser_dl_bootstrap(add_linkedin_modules, rump_kernelfsym_load);
+ rump_component_init(RUMP_COMPONENT_KERN);
+
/* these do nothing if not present */
rump_vfs_init();
rump_net_init();
rump_dev_init();
+
+ rump_component_init(RUMP_COMPONENT_KERN_VFS);
+
cold = 0;
/* aieeeedondest */
Index: src/sys/rump/librump/rumpkern/rump_private.h
diff -u src/sys/rump/librump/rumpkern/rump_private.h:1.51 src/sys/rump/librump/rumpkern/rump_private.h:1.52
--- src/sys/rump/librump/rumpkern/rump_private.h:1.51 Thu Jun 10 21:40:42 2010
+++ src/sys/rump/librump/rumpkern/rump_private.h Sat Jun 12 07:13:54 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_private.h,v 1.51 2010/06/10 21:40:42 pooka Exp $ */
+/* $NetBSD: rump_private.h,v 1.52 2010/06/12 07:13:54 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -64,6 +64,7 @@
RUMP_COMPONENT_DEV,
RUMP_COMPONENT_NET, RUMP_COMPONENT_NET_ROUTE, RUMP_COMPONENT_NET_IF,
RUMP_COMPONENT_VFS,
+ RUMP_COMPONENT_KERN, RUMP_COMPONENT_KERN_VFS,
RUMP_COMPONENT_MAX,
};
struct rump_component {