Module Name: src
Committed By: pooka
Date: Sun Sep 6 20:54:19 UTC 2009
Modified Files:
src/sys/rump/librump/rumpkern: Makefile.rumpkern rump.c
Log Message:
Run rump_dev_init() where available.
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/rump/librump/rumpkern/Makefile.rumpkern
cvs rdiff -u -r1.111 -r1.112 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.46 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.47
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.46 Tue Jun 2 23:28:53 2009
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern Sun Sep 6 20:54:19 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpkern,v 1.46 2009/06/02 23:28:53 pooka Exp $
+# $NetBSD: Makefile.rumpkern,v 1.47 2009/09/06 20:54:19 pooka Exp $
#
.include "${RUMPTOP}/Makefile.rump"
@@ -60,8 +60,8 @@
SHLIB_MAJOR= 0
SHLIB_MINOR= 0
-CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern
-CPPFLAGS+= -I${RUMPTOP}/librump/rumpnet -I${RUMPTOP}/librump/rumpvfs
+CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern -I${RUMPTOP}/librump/rumpvfs
+CPPFLAGS+= -I${RUMPTOP}/librump/rumpnet -I${RUMPTOP}/librump/rumpdev
CFLAGS+= -Wno-pointer-sign
AFLAGS+= -D_LOCORE -Wa,-fatal-warnings
Index: src/sys/rump/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.111 src/sys/rump/librump/rumpkern/rump.c:1.112
--- src/sys/rump/librump/rumpkern/rump.c:1.111 Fri Sep 4 12:27:09 2009
+++ src/sys/rump/librump/rumpkern/rump.c Sun Sep 6 20:54:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.c,v 1.111 2009/09/04 12:27:09 pooka Exp $ */
+/* $NetBSD: rump.c,v 1.112 2009/09/06 20:54:19 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.111 2009/09/04 12:27:09 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.112 2009/09/06 20:54:19 pooka Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -65,6 +65,7 @@
#include "rump_private.h"
#include "rump_net_private.h"
#include "rump_vfs_private.h"
+#include "rump_dev_private.h"
struct proc proc0;
struct session rump_session = {
@@ -116,6 +117,7 @@
void rump__unavailable() {}
__weak_alias(rump_net_init,rump__unavailable);
__weak_alias(rump_vfs_init,rump__unavailable);
+__weak_alias(rump_dev_init,rump__unavailable);
void rump__unavailable_vfs_panic(void);
void rump__unavailable_vfs_panic() {panic("vfs component not available");}
@@ -245,13 +247,14 @@
module_init();
sysctl_init();
softint_init(&rump_cpu);
- cold = 0;
devsw_init();
secmodel_start();
/* these do nothing if not present */
rump_vfs_init();
rump_net_init();
+ rump_dev_init();
+ cold = 0;
/* aieeeedondest */
if (rump_threads) {
