diff options
| author | ad <ad@NetBSD.org> | 2008-05-04 12:52:58 +0000 |
|---|---|---|
| committer | ad <ad@NetBSD.org> | 2008-05-04 12:52:58 +0000 |
| commit | 0f457ea616106fb83aab64689be1df4b047e09fd (patch) | |
| tree | 5695b02a47c48ceb23c80e40d482b47492a097a8 /sys | |
| parent | 517f9684fee0e0150c67316be27a9508dc304a34 (diff) | |
Pull in the kernel module stuff so that rump can set up built-in modules.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/rump/librump/rumpkern/Makefile | 5 | ||||
| -rw-r--r-- | sys/rump/librump/rumpkern/misc_stub.c | 9 | ||||
| -rw-r--r-- | sys/rump/librump/rumpkern/opt/opt_modular.h | 1 | ||||
| -rw-r--r-- | sys/rump/librump/rumpkern/rump.c | 4 |
4 files changed, 8 insertions, 11 deletions
diff --git a/sys/rump/librump/rumpkern/Makefile b/sys/rump/librump/rumpkern/Makefile index 5828bcf1f4b..ba2ab203d96 100644 --- a/sys/rump/librump/rumpkern/Makefile +++ b/sys/rump/librump/rumpkern/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2008/03/21 21:55:01 ad Exp $ +# $NetBSD: Makefile,v 1.33 2008/05/04 12:52:58 ad Exp $ # .include <bsd.own.mk> @@ -23,7 +23,8 @@ SRCS+= clock_subr.c kern_descrip.c kern_lock.c kern_stub.c param.c \ subr_bufq.c subr_hash.c subr_prf2.c subr_specificdata.c \ subr_time.c subr_workqueue.c sys_descrip.c sys_generic.c vfs_bio.c \ vfs_cache.c vfs_getcwd.c vfs_hooks.c vfs_init.c vfs_lookup.c \ - vfs_subr.c vfs_subr2.c vfs_vnops.c vfs_syscalls.c vnode_if.c + vfs_subr.c vfs_subr2.c vfs_vnops.c vfs_syscalls.c vnode_if.c \ + subr_kobj.c kern_module.c # sys/miscfs SRCS+= genfs_vfsops.c genfs_vnops.c sync_subr.c diff --git a/sys/rump/librump/rumpkern/misc_stub.c b/sys/rump/librump/rumpkern/misc_stub.c index 5950dcaf235..6a9f5b8e34d 100644 --- a/sys/rump/librump/rumpkern/misc_stub.c +++ b/sys/rump/librump/rumpkern/misc_stub.c @@ -1,4 +1,4 @@ -/* $NetBSD: misc_stub.c,v 1.8 2008/04/11 15:24:48 ad Exp $ */ +/* $NetBSD: misc_stub.c,v 1.9 2008/05/04 12:52:58 ad Exp $ */ /* * Copyright (c) 2007 Antti Kantee. All Rights Reserved. @@ -32,7 +32,6 @@ #include <sys/sched.h> #include <sys/sysctl.h> #include <sys/systm.h> -#include <sys/module.h> #include <sys/cpu.h> #include <sys/evcnt.h> @@ -108,12 +107,6 @@ sysctl_unlock(void) } -void -module_init_class(modclass_t mc) -{ - -} - struct cpu_info * cpu_lookup_byindex(u_int index) { diff --git a/sys/rump/librump/rumpkern/opt/opt_modular.h b/sys/rump/librump/rumpkern/opt/opt_modular.h new file mode 100644 index 00000000000..978917f79d1 --- /dev/null +++ b/sys/rump/librump/rumpkern/opt/opt_modular.h @@ -0,0 +1 @@ +/* $NetBSD: opt_modular.h,v 1.1 2008/05/04 12:52:58 ad Exp $ */ diff --git a/sys/rump/librump/rumpkern/rump.c b/sys/rump/librump/rumpkern/rump.c index 0c8a4f89640..07eebde7fed 100644 --- a/sys/rump/librump/rumpkern/rump.c +++ b/sys/rump/librump/rumpkern/rump.c @@ -1,4 +1,4 @@ -/* $NetBSD: rump.c,v 1.43 2008/04/28 19:31:45 pooka Exp $ */ +/* $NetBSD: rump.c,v 1.44 2008/05/04 12:52:58 ad Exp $ */ /* * Copyright (c) 2007 Antti Kantee. All Rights Reserved. @@ -39,6 +39,7 @@ #include <sys/select.h> #include <sys/vnode.h> #include <sys/vfs_syscalls.h> +#include <sys/module.h> #include <miscfs/specfs/specdev.h> @@ -131,6 +132,7 @@ rump_init() rumpuser_thrinit(); fd_sys_init(); + module_init(); vfsinit(); bufinit(); |
