summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/modules/Makefile13
-rw-r--r--sys/modules/atapi/Makefile6
-rw-r--r--sys/modules/ccd/Makefile7
-rw-r--r--sys/modules/cd9660/Makefile8
-rw-r--r--sys/modules/coda/Makefile8
-rw-r--r--sys/modules/coff/Makefile10
-rw-r--r--sys/modules/coff/coff.c62
-rw-r--r--sys/modules/fdesc/Makefile8
-rw-r--r--sys/modules/fdescfs/Makefile8
-rw-r--r--sys/modules/fpu/Makefile8
-rw-r--r--sys/modules/gnufpu/Makefile8
-rw-r--r--sys/modules/ibcs2/Makefile8
-rw-r--r--sys/modules/ibcs2/ibcs2.c38
-rw-r--r--sys/modules/if_disc/Makefile7
-rw-r--r--sys/modules/if_ppp/Makefile7
-rw-r--r--sys/modules/if_sl/Makefile7
-rw-r--r--sys/modules/if_tun/Makefile7
-rw-r--r--sys/modules/ip_mroute_mod/Makefile6
-rw-r--r--sys/modules/ipfw/Makefile6
-rw-r--r--sys/modules/joy/Makefile6
-rw-r--r--sys/modules/kernfs/Makefile8
-rw-r--r--sys/modules/linux/Makefile10
-rw-r--r--sys/modules/linux/linux.c87
-rw-r--r--sys/modules/mfs/Makefile13
-rw-r--r--sys/modules/msdos/Makefile8
-rw-r--r--sys/modules/msdosfs/Makefile8
-rw-r--r--sys/modules/nfs/Makefile12
-rw-r--r--sys/modules/nfsclient/Makefile12
-rw-r--r--sys/modules/nfsserver/Makefile12
-rw-r--r--sys/modules/nullfs/Makefile8
-rw-r--r--sys/modules/pcic/Makefile7
-rw-r--r--sys/modules/portal/Makefile8
-rw-r--r--sys/modules/portalfs/Makefile8
-rw-r--r--sys/modules/procfs/Makefile8
-rw-r--r--sys/modules/syscons/Makefile.inc3
-rw-r--r--sys/modules/syscons/blank/Makefile4
-rw-r--r--sys/modules/syscons/daemon/Makefile4
-rw-r--r--sys/modules/syscons/fade/Makefile4
-rw-r--r--sys/modules/syscons/green/Makefile4
-rw-r--r--sys/modules/syscons/snake/Makefile4
-rw-r--r--sys/modules/syscons/star/Makefile4
-rw-r--r--sys/modules/umapfs/Makefile8
-rw-r--r--sys/modules/union/Makefile8
-rw-r--r--sys/modules/unionfs/Makefile8
-rw-r--r--sys/modules/vesa/Makefile6
-rw-r--r--sys/modules/vinum/Makefile7
-rw-r--r--sys/modules/vinum/vinum.c39
-rw-r--r--sys/modules/wcd/Makefile6
48 files changed, 219 insertions, 337 deletions
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 992f872..bc956d9 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -1,13 +1,14 @@
-# $Id: Makefile,v 1.32 1998/09/25 17:51:44 rvb Exp $
+# $Id: Makefile,v 1.33 1998/09/28 05:38:22 grog Exp $
-# XXX present but broken: ip_mroute_mod mfs
+# XXX present but broken: ip_mroute_mod
+# XXX not yet completed porting: pcic coda syscons/*
.if ${MACHINE_ARCH} == "i386"
-SUBDIR= atapi coda ccd cd9660 coff fdesc ibcs2 if_disc if_ppp if_sl if_tun \
- ipfw joy kernfs linux msdos nfs nullfs \
- pcic portal procfs syscons umapfs vesa vinum wcd
+SUBDIR= atapi ccd cd9660 coff fdesc fpu gnufpu ibcs2 if_disc if_ppp if_sl \
+ if_tun ipfw joy kernfs linux mfs msdos nfs nullfs \
+ portal procfs syscons umapfs vesa vinum wcd
.endif
# XXX builds, but not useable with present design
-# fpu gnufpu union
+#union
.include <bsd.subdir.mk>
diff --git a/sys/modules/atapi/Makefile b/sys/modules/atapi/Makefile
index fce2cd1..22b5a7e 100644
--- a/sys/modules/atapi/Makefile
+++ b/sys/modules/atapi/Makefile
@@ -1,7 +1,7 @@
-# $Id: Makefile,v 1.10 1998/02/01 17:53:53 bde Exp $
+# $Id: Makefile,v 1.11 1998/02/25 01:40:54 bde Exp $
-.PATH: ${.CURDIR}/../../sys/i386/isa
-KMOD = atapi_mod
+.PATH: ${.CURDIR}/../../i386/isa
+KMOD = atapi
SRCS = atapi.c wdc.h opt_atapi.h #wcd.h
NOMAN =
CFLAGS += -DATAPI_MODULE
diff --git a/sys/modules/ccd/Makefile b/sys/modules/ccd/Makefile
index b5b989b..93cf3c1 100644
--- a/sys/modules/ccd/Makefile
+++ b/sys/modules/ccd/Makefile
@@ -1,10 +1,9 @@
-# $Id: Makefile,v 1.5 1997/02/22 12:47:41 peter Exp $
+# $Id: Makefile,v 1.6 1998/02/01 18:12:12 bde Exp $
-.PATH: ${.CURDIR}/../../sys/dev/ccd
-KMOD= ccd_mod
+.PATH: ${.CURDIR}/../../dev/ccd
+KMOD= ccd
SRCS= ccd.c ccd.h vnode_if.h
NOMAN=
-PSEUDO_LKM=
NCCD?= 4
CLEANFILES+= ccd.h vnode_if.h vnode_if.c
diff --git a/sys/modules/cd9660/Makefile b/sys/modules/cd9660/Makefile
index bcf4cbc..9c2dd4b 100644
--- a/sys/modules/cd9660/Makefile
+++ b/sys/modules/cd9660/Makefile
@@ -1,11 +1,11 @@
-# $Id: Makefile,v 1.4 1998/02/04 21:56:34 eivind Exp $
+# $Id: Makefile,v 1.5 1998/02/06 23:54:19 eivind Exp $
-.PATH: ${.CURDIR}/../../sys/isofs/cd9660
-KMOD= cd9660_mod
+.PATH: ${.CURDIR}/../../isofs/cd9660
+KMOD= cd9660
SRCS= cd9660_bmap.c cd9660_lookup.c cd9660_node.c cd9660_rrip.c \
cd9660_util.c cd9660_vfsops.c cd9660_vnops.c
NOMAN=
-VFS_LKM=
+VFS_KLD=
CFLAGS+= -DCD9660
.include <bsd.kmod.mk>
diff --git a/sys/modules/coda/Makefile b/sys/modules/coda/Makefile
index c014608..9135235 100644
--- a/sys/modules/coda/Makefile
+++ b/sys/modules/coda/Makefile
@@ -1,10 +1,10 @@
-# $Id: Makefile,v 1.1.1.1 1998/09/25 17:47:48 rvb Exp $
+# $Id: Makefile,v 1.2 1998/09/29 20:19:45 rvb Exp $
-.PATH: ${.CURDIR}/../../sys/coda
-KMOD= coda_mod
+.PATH: ${.CURDIR}/../../coda
+KMOD= coda
SRCS= coda_fbsd.c coda_namecache.c coda_psdev.c coda_subr.c \
coda_venus.c coda_vfsops.c coda_vnops.c
NOMAN=
-VFS_LKM=
+VFS_KLD=
.include <bsd.kmod.mk>
diff --git a/sys/modules/coff/Makefile b/sys/modules/coff/Makefile
index e9f2910..dbfd197 100644
--- a/sys/modules/coff/Makefile
+++ b/sys/modules/coff/Makefile
@@ -1,11 +1,11 @@
-# $Id: Makefile,v 1.5 1998/02/01 18:12:12 bde Exp $
+# $Id: Makefile,v 1.6 1998/03/12 20:04:38 eivind Exp $
-.PATH: ${.CURDIR}/../../sys/i386/ibcs2
-KMOD= ibcs2_coff_mod
-SRCS= coff.c imgact_coff.c vnode_if.h
+.PATH: ${.CURDIR}/../../i386/ibcs2
+KMOD= ibcs2_coff
+SRCS= imgact_coff.c vnode_if.h
NOMAN=
CLEANFILES+= vnode_if.h vnode_if.c
-CFLAGS+= -DLKM -DCOMPAT_IBCS2
+CFLAGS+= -DCOMPAT_IBCS2
DEPLKMS=${.OBJDIR}/../ibcs2/ibcs2_mod.o
.include <bsd.kmod.mk>
diff --git a/sys/modules/coff/coff.c b/sys/modules/coff/coff.c
deleted file mode 100644
index cc12cdf..0000000
--- a/sys/modules/coff/coff.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*-
- * Copyright (c) 1994 Søren Schmidt
- * All rights reserved.
- *
- * 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
- * in this position and unchanged.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software withough specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS 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 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.
- *
- * $Id: coff.c,v 1.9 1997/04/06 10:47:39 dufault Exp $
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/exec.h>
-#include <sys/conf.h>
-#include <sys/sysent.h>
-#include <sys/lkm.h>
-#include <sys/errno.h>
-
-extern const struct execsw coff_execsw;
-
-MOD_EXEC(ibcs2_coff, -1, &coff_execsw);
-
-static int
-ibcs2_coff_load(struct lkm_table *lkmtp, int cmd)
-{
- /* uprintf("coff loader installed\n"); XXX shut up, you! */
- return 0;
-}
-
-static int
-ibcs2_coff_unload(struct lkm_table *lkmtp, int cmd)
-{
- uprintf("coff loader removed\n");
- return 0;
-}
-
-int
-ibcs2_coff_mod(struct lkm_table *lkmtp, int cmd, int ver)
-{
- MOD_DISPATCH(ibcs2_coff, lkmtp, cmd, ver,
- ibcs2_coff_load, ibcs2_coff_unload, lkm_nullcmd);
-}
diff --git a/sys/modules/fdesc/Makefile b/sys/modules/fdesc/Makefile
index 9082068..6052e62 100644
--- a/sys/modules/fdesc/Makefile
+++ b/sys/modules/fdesc/Makefile
@@ -1,10 +1,10 @@
-# $Id$
+# $Id: Makefile,v 1.3 1997/02/22 12:47:49 peter Exp $
-.PATH: ${.CURDIR}/../../sys/miscfs/fdesc
-KMOD= fdesc_mod
+.PATH: ${.CURDIR}/../../miscfs/fdesc
+KMOD= fdesc
SRCS= fdesc_vfsops.c fdesc_vnops.c
NOMAN=
-VFS_LKM=
+VFS_KLD=
CFLAGS+= -DFDESC
.include <bsd.kmod.mk>
diff --git a/sys/modules/fdescfs/Makefile b/sys/modules/fdescfs/Makefile
index 9082068..6052e62 100644
--- a/sys/modules/fdescfs/Makefile
+++ b/sys/modules/fdescfs/Makefile
@@ -1,10 +1,10 @@
-# $Id$
+# $Id: Makefile,v 1.3 1997/02/22 12:47:49 peter Exp $
-.PATH: ${.CURDIR}/../../sys/miscfs/fdesc
-KMOD= fdesc_mod
+.PATH: ${.CURDIR}/../../miscfs/fdesc
+KMOD= fdesc
SRCS= fdesc_vfsops.c fdesc_vnops.c
NOMAN=
-VFS_LKM=
+VFS_KLD=
CFLAGS+= -DFDESC
.include <bsd.kmod.mk>
diff --git a/sys/modules/fpu/Makefile b/sys/modules/fpu/Makefile
index 5a16be5..680e3c7 100644
--- a/sys/modules/fpu/Makefile
+++ b/sys/modules/fpu/Makefile
@@ -1,10 +1,8 @@
-# $Id: Makefile,v 1.3 1997/02/22 12:47:51 peter Exp $
+# $Id: Makefile,v 1.4 1997/07/20 08:46:27 bde Exp $
-.PATH: ${.CURDIR}/../../sys/i386/i386
-KMOD= fpu_mod
+.PATH: ${.CURDIR}/../../i386/i386
+KMOD= fpu
SRCS= math_emulate.c
NOMAN=
-PSEUDO_LKM=
-CFLAGS+= -DLKM
.include <bsd.kmod.mk>
diff --git a/sys/modules/gnufpu/Makefile b/sys/modules/gnufpu/Makefile
index 85610c2..2332e4b 100644
--- a/sys/modules/gnufpu/Makefile
+++ b/sys/modules/gnufpu/Makefile
@@ -1,15 +1,13 @@
-# $Id: Makefile,v 1.4 1997/07/20 08:46:30 bde Exp $
+# $Id: Makefile,v 1.5 1997/08/26 13:49:26 bde Exp $
-.PATH: ${.CURDIR}/../../sys/gnu/i386/fpemul
-KMOD= gnufpu_mod
+.PATH: ${.CURDIR}/../../gnu/i386/fpemul
+KMOD= gnufpu
SRCS= div_small.s errors.c fpu_arith.c fpu_aux.c fpu_entry.c fpu_etc.c \
fpu_trig.c get_address.c load_store.c poly_2xm1.c poly_atan.c \
poly_div.s poly_l2.c poly_mul64.s poly_sin.c poly_tan.c \
polynomial.s reg_add_sub.c reg_compare.c reg_constant.c reg_div.s \
reg_ld_str.c reg_u_mul.s reg_u_sub.s wm_shrx.s wm_sqrt.s
NOMAN=
-PSEUDO_LKM=
-CFLAGS+= -DLKM
.s.o:
${CC} -x assembler-with-cpp -DLOCORE ${CFLAGS} -c \
diff --git a/sys/modules/ibcs2/Makefile b/sys/modules/ibcs2/Makefile
index 9136c63..3f42872 100644
--- a/sys/modules/ibcs2/Makefile
+++ b/sys/modules/ibcs2/Makefile
@@ -1,7 +1,7 @@
-# $Id: Makefile,v 1.16 1998/02/04 21:56:35 eivind Exp $
+# $Id: Makefile,v 1.17 1998/02/06 23:54:20 eivind Exp $
-.PATH: ${.CURDIR}/../../sys/i386/ibcs2
-KMOD= ibcs2_mod
+.PATH: ${.CURDIR}/../../i386/ibcs2
+KMOD= ibcs2
SRCS= ibcs2.c ibcs2_errno.c ibcs2_ipc.c ibcs2_stat.c ibcs2_misc.c \
ibcs2_fcntl.c ibcs2_signal.c ibcs2_sysent.c ibcs2_ioctl.c \
ibcs2_socksys.c ibcs2_util.c ibcs2_xenix.c ibcs2_xenix_sysent.c \
@@ -10,7 +10,7 @@ SRCS= ibcs2.c ibcs2_errno.c ibcs2_ipc.c ibcs2_stat.c ibcs2_misc.c \
vnode_if.h opt_spx_hack.h
MAN8= ibcs2.8
-CFLAGS+= -DLKM -DCOMPAT_IBCS2
+CFLAGS+= -DCOMPAT_IBCS2
CLEANFILES+= vnode_if.h vnode_if.c opt_spx_hack.h
EXPORT_SYMS= _ibcs2_mod _ibcs2_emul_path _ibcs2_svr3_sysvec
diff --git a/sys/modules/ibcs2/ibcs2.c b/sys/modules/ibcs2/ibcs2.c
index edc712e..2bd5fb6 100644
--- a/sys/modules/ibcs2/ibcs2.c
+++ b/sys/modules/ibcs2/ibcs2.c
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: ibcs2.c,v 1.10 1997/04/06 10:47:52 dufault Exp $
+ * $Id: ibcs2.c,v 1.11 1997/05/01 06:09:01 jkh Exp $
*/
#include <sys/param.h>
@@ -36,25 +36,29 @@
#include <sys/sysent.h>
#include <sys/lkm.h>
-MOD_MISC(ibcs2);
+#include <sys/kernel.h>
+#include <sys/module.h>
static int
-ibcs2_load(struct lkm_table *lkmtp, int cmd)
+ibcs2_modevent(module_t mod, modeventtype_t type, void *unused)
{
- /* uprintf("ibcs2 emulator installed\n"); XXX - shut up, you! */
- return 0;
+ switch (type) {
+ case MOD_LOAD:
+ printf("ibcs2 module loaded\n");
+ break;
+ case MOD_UNLOAD:
+ printf("ibcs2 module unloaded\n");
+ break;
+ default:
+ printf("ibcs2 module unknown event: 0x%x\n", type);
+ }
+ return 0;
}
-static int
-ibcs2_unload(struct lkm_table *lkmtp, int cmd)
-{
- uprintf("ibcs2 emulator removed\n");
- return 0;
-}
+moduledata_t ibcs2mod = {
+ "ibcs2",
+ ibcs2_modevent,
+ 0
+};
-int
-ibcs2_mod(struct lkm_table *lkmtp, int cmd, int ver)
-{
- MOD_DISPATCH(ibcs2, lkmtp, cmd, ver,
- ibcs2_load, ibcs2_unload, lkm_nullcmd);
-}
+DECLARE_MODULE(ibcs2, ibcs2mod, SI_SUB_PSEUDO, SI_ORDER_ANY);
diff --git a/sys/modules/if_disc/Makefile b/sys/modules/if_disc/Makefile
index 747f942..b95b478 100644
--- a/sys/modules/if_disc/Makefile
+++ b/sys/modules/if_disc/Makefile
@@ -1,10 +1,9 @@
-# $Id: Makefile,v 1.4 1998/01/08 23:50:13 eivind Exp $
+# $Id: Makefile,v 1.5 1998/02/01 18:12:13 bde Exp $
-.PATH: ${.CURDIR}/../../sys/net
-KMOD= if_disc_mod
+.PATH: ${.CURDIR}/../../net
+KMOD= if_disc
SRCS= if_disc.c bpfilter.h opt_inet.h
NOMAN=
-PSEUDO_LKM=
NBPFILTER?= 0
diff --git a/sys/modules/if_ppp/Makefile b/sys/modules/if_ppp/Makefile
index e2721a0..34b90d8 100644
--- a/sys/modules/if_ppp/Makefile
+++ b/sys/modules/if_ppp/Makefile
@@ -1,11 +1,10 @@
-# $Id: Makefile,v 1.13 1998/02/01 18:12:13 bde Exp $
+# $Id: Makefile,v 1.14 1998/03/27 04:05:08 peter Exp $
-.PATH: ${.CURDIR}/../../sys/net
-KMOD= if_ppp_mod
+.PATH: ${.CURDIR}/../../net
+KMOD= if_ppp
SRCS= if_ppp.c ppp_tty.c slcompress.c \
bpfilter.h ppp.h opt_inet.h opt_ipx.h opt_ppp.h
NOMAN=
-PSEUDO_LKM=
NPPP?= 2
PPP_BSDCOMP?= 1 # 0/1
diff --git a/sys/modules/if_sl/Makefile b/sys/modules/if_sl/Makefile
index 5825951..6d14477 100644
--- a/sys/modules/if_sl/Makefile
+++ b/sys/modules/if_sl/Makefile
@@ -1,10 +1,9 @@
-# $Id: Makefile,v 1.5 1998/01/08 23:50:23 eivind Exp $
+# $Id: Makefile,v 1.6 1998/02/01 18:12:14 bde Exp $
-.PATH: ${.CURDIR}/../../sys/net
-KMOD= if_sl_mod
+.PATH: ${.CURDIR}/../../net
+KMOD= if_sl
SRCS= if_sl.c slcompress.c bpfilter.h opt_inet.h sl.h
NOMAN=
-PSEUDO_LKM=
NBPFILTER?= 0
NSL?= 2
diff --git a/sys/modules/if_tun/Makefile b/sys/modules/if_tun/Makefile
index 33e9c2e..2581e36 100644
--- a/sys/modules/if_tun/Makefile
+++ b/sys/modules/if_tun/Makefile
@@ -1,10 +1,9 @@
-# $Id: Makefile,v 1.5 1998/01/24 02:21:49 eivind Exp $
+# $Id: Makefile,v 1.6 1998/02/01 18:12:14 bde Exp $
-.PATH: ${.CURDIR}/../../sys/net
-KMOD= if_tun_mod
+.PATH: ${.CURDIR}/../../net
+KMOD= if_tun
SRCS= if_tun.c bpfilter.h opt_devfs.h opt_inet.h tun.h
NOMAN=
-PSEUDO_LKM=
NBPFILTER?= 0
NTUN?= 2
diff --git a/sys/modules/ip_mroute_mod/Makefile b/sys/modules/ip_mroute_mod/Makefile
index 7e78283..f44df9f 100644
--- a/sys/modules/ip_mroute_mod/Makefile
+++ b/sys/modules/ip_mroute_mod/Makefile
@@ -1,7 +1,7 @@
-# $Id$
+# $Id: Makefile,v 1.3 1997/02/22 12:48:12 peter Exp $
-.PATH: ${.CURDIR}/../../sys/netinet
-KMOD= ip_mroute_mod
+.PATH: ${.CURDIR}/../../netinet
+KMOD= ip_mroute
SRCS= ip_mroute.c
NOMAN=
CFLAGS+= -DMROUTE_LKM -DMROUTING
diff --git a/sys/modules/ipfw/Makefile b/sys/modules/ipfw/Makefile
index 2afebe8..c5300e8 100644
--- a/sys/modules/ipfw/Makefile
+++ b/sys/modules/ipfw/Makefile
@@ -1,7 +1,7 @@
-# $Id: Makefile,v 1.7 1997/02/22 12:48:14 peter Exp $
+# $Id: Makefile,v 1.8 1997/09/10 04:19:07 peter Exp $
-.PATH: ${.CURDIR}/../../sys/netinet
-KMOD= ipfw_mod
+.PATH: ${.CURDIR}/../../netinet
+KMOD= ipfw
SRCS= ip_fw.c
NOMAN=
CFLAGS+= -DIPFIREWALL -DIPFIREWALL_MODULE
diff --git a/sys/modules/joy/Makefile b/sys/modules/joy/Makefile
index e3b880f..ebbf4c9 100644
--- a/sys/modules/joy/Makefile
+++ b/sys/modules/joy/Makefile
@@ -1,7 +1,7 @@
-# $Id: Makefile,v 1.6 1998/01/24 02:21:51 eivind Exp $
+# $Id: Makefile,v 1.7 1998/02/01 18:12:15 bde Exp $
-.PATH: ${.CURDIR}/../../sys/i386/isa
-KMOD = joy_mod
+.PATH: ${.CURDIR}/../../i386/isa
+KMOD = joy
SRCS = joy.c joy.h opt_devfs.h
MAN8 = joy.8
diff --git a/sys/modules/kernfs/Makefile b/sys/modules/kernfs/Makefile
index 8139d94..d1c7500 100644
--- a/sys/modules/kernfs/Makefile
+++ b/sys/modules/kernfs/Makefile
@@ -1,10 +1,10 @@
-# $Id$
+# $Id: Makefile,v 1.3 1997/02/22 12:48:21 peter Exp $
-.PATH: ${.CURDIR}/../../sys/miscfs/kernfs
-KMOD= kernfs_mod
+.PATH: ${.CURDIR}/../../miscfs/kernfs
+KMOD= kernfs
SRCS= kernfs_vfsops.c kernfs_vnops.c
NOMAN=
-VFS_LKM=
+VFS_KLD=
CFLAGS+= -DKERNFS
.include <bsd.kmod.mk>
diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile
index d4a14f4..090f2fc 100644
--- a/sys/modules/linux/Makefile
+++ b/sys/modules/linux/Makefile
@@ -1,15 +1,15 @@
-# $Id: Makefile,v 1.17 1998/07/01 17:10:00 bde Exp $
+# $Id: Makefile,v 1.18 1998/07/07 02:04:20 bde Exp $
-.PATH: ${.CURDIR}/../../sys/i386/linux
-KMOD= linux_mod
-SRCS= linux.c linux_file.c linux_ioctl.c linux_misc.c linux_signal.c \
+.PATH: ${.CURDIR}/../../i386/linux
+KMOD= linux
+SRCS= linux_file.c linux_ioctl.c linux_misc.c linux_signal.c \
linux_ipc.c linux_socket.c linux_stats.c \
linux_dummy.c linux_sysent.c linux_sysvec.c linux_util.c \
imgact_linux.c opt_compat.h opt_linux.h opt_vmpage.h vnode_if.h
OBJS= linux_locore.o
MAN8= linux.8
-CFLAGS+= -DLKM -DCOMPAT_LINUX #-DDEBUG
+CFLAGS+= -DCOMPAT_LINUX #-DDEBUG
EXPORT_SYMS=_linux_mod
CLEANFILES+= vnode_if.h vnode_if.c linux_genassym.o linux_genassym \
linux_assym.h opt_compat.h opt_linux.h opt_vmpage.h
diff --git a/sys/modules/linux/linux.c b/sys/modules/linux/linux.c
deleted file mode 100644
index b3da352..0000000
--- a/sys/modules/linux/linux.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*-
- * Copyright (c) 1994 Søren Schmidt
- * All rights reserved.
- *
- * 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
- * in this position and unchanged.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software withough specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS 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 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.
- *
- * $Id: linux.c,v 1.13 1998/09/17 22:08:34 msmith Exp $
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/exec.h>
-#include <sys/conf.h>
-#include <sys/sysent.h>
-#include <sys/lkm.h>
-#include <sys/imgact_elf.h>
-#include "i386/linux/linux.h"
-
-extern const struct execsw linux_execsw;
-
-MOD_EXEC(linux, -1, &linux_execsw);
-
-extern Elf32_Brandinfo *linux_brandlist[];
-
-static int
-linux_load(struct lkm_table *lkmtp, int cmd)
-{
- Elf32_Brandinfo **brandinfo;
- int error;
-
- error = 0;
-
- for (brandinfo = &linux_brandlist[0]; *brandinfo != NULL; ++brandinfo)
- if (elf_insert_brand_entry(*brandinfo) < 0)
- error = 1;
-
- if (error)
- printf("Could not install ELF interpreter entry\n");
- /* uprintf("Linux emulator installed\n"); XXX - shut up, you! */
- return 0;
-}
-
-static int
-linux_unload(struct lkm_table *lkmtp, int cmd)
-{
- Elf32_Brandinfo **brandinfo;
- int error;
-
- error = 0;
-
- for (brandinfo = &linux_brandlist[0]; *brandinfo != NULL; ++brandinfo)
- if (elf_remove_brand_entry(*brandinfo) < 0)
- error = 1;
-
- if (error)
- uprintf("Could not deinstall ELF interpreter entry\n");
- uprintf("Linux emulator removed\n");
- return 0;
-}
-
-int
-linux_mod(struct lkm_table *lkmtp, int cmd, int ver)
-{
- MOD_DISPATCH(linux,lkmtp, cmd, ver,
- linux_load, linux_unload, lkm_nullcmd);
-}
diff --git a/sys/modules/mfs/Makefile b/sys/modules/mfs/Makefile
index ee0afa8..d1fb29b 100644
--- a/sys/modules/mfs/Makefile
+++ b/sys/modules/mfs/Makefile
@@ -1,10 +1,13 @@
-# $Id$
+# $Id: Makefile,v 1.3 1997/02/22 12:48:36 peter Exp $
-.PATH: ${.CURDIR}/../../sys/ufs/mfs
-KMOD= mfs_mod
-SRCS= mfs_vfsops.c mfs_vnops.c
+.PATH: ${.CURDIR}/../../ufs/mfs
+KMOD= mfs
+SRCS= mfs_vfsops.c mfs_vnops.c opt_mfs.h
NOMAN=
-VFS_LKM=
+VFS_KLD=
CFLAGS+= -DFFS -DMFS
+opt_mfs.h:
+ touch opt_mfs.h
+
.include <bsd.kmod.mk>
diff --git a/sys/modules/msdos/Makefile b/sys/modules/msdos/Makefile
index 40aa777..cc81022 100644
--- a/sys/modules/msdos/Makefile
+++ b/sys/modules/msdos/Makefile
@@ -1,11 +1,11 @@
-# $Id: Makefile,v 1.5 1998/02/04 21:56:36 eivind Exp $
+# $Id: Makefile,v 1.6 1998/02/06 23:54:22 eivind Exp $
-.PATH: ${.CURDIR}/../../sys/msdosfs
-KMOD= msdos_mod
+.PATH: ${.CURDIR}/../../msdosfs
+KMOD= msdos
SRCS= msdosfs_conv.c msdosfs_denode.c msdosfs_fat.c msdosfs_lookup.c \
msdosfs_vfsops.c msdosfs_vnops.c
NOMAN=
-VFS_LKM=
+VFS_KLD=
CFLAGS+= -DMSDOSFS
.include <bsd.kmod.mk>
diff --git a/sys/modules/msdosfs/Makefile b/sys/modules/msdosfs/Makefile
index 40aa777..cc81022 100644
--- a/sys/modules/msdosfs/Makefile
+++ b/sys/modules/msdosfs/Makefile
@@ -1,11 +1,11 @@
-# $Id: Makefile,v 1.5 1998/02/04 21:56:36 eivind Exp $
+# $Id: Makefile,v 1.6 1998/02/06 23:54:22 eivind Exp $
-.PATH: ${.CURDIR}/../../sys/msdosfs
-KMOD= msdos_mod
+.PATH: ${.CURDIR}/../../msdosfs
+KMOD= msdos
SRCS= msdosfs_conv.c msdosfs_denode.c msdosfs_fat.c msdosfs_lookup.c \
msdosfs_vfsops.c msdosfs_vnops.c
NOMAN=
-VFS_LKM=
+VFS_KLD=
CFLAGS+= -DMSDOSFS
.include <bsd.kmod.mk>
diff --git a/sys/modules/nfs/Makefile b/sys/modules/nfs/Makefile
index 71b19a9..719adcd 100644
--- a/sys/modules/nfs/Makefile
+++ b/sys/modules/nfs/Makefile
@@ -1,15 +1,15 @@
-# $Id$
+# $Id: Makefile,v 1.10 1998/07/07 02:27:09 bde Exp $
-.PATH: ${.CURDIR}/../../sys/nfs
-KMOD= nfs_mod
+.PATH: ${.CURDIR}/../../nfs
+KMOD= nfs
SRCS= nfs_bio.c nfs_node.c nfs_nqlease.c nfs_serv.c nfs_socket.c \
nfs_srvcache.c nfs_subs.c nfs_syscalls.c nfs_vfsops.c \
nfs_vnops.c opt_inet.h opt_nfs.h opt_vmpage.h
NFS_INET?= 1 # 0/1 - requires INET to be configured in kernel
NOMAN=
-VFS_LKM=
+VFS_KLD=
CFLAGS+= -DNFS
-CLEANFILES= opt_inet.h opt_nfs.h opt_vmpage.h
+CLEANFILES= opt_inet.h opt_nfs.h opt_vmpage.h opt_posix.h
opt_inet.h:
touch ${.TARGET}
@@ -17,7 +17,7 @@ opt_inet.h:
echo "#define INET 1" > ${.TARGET}
.endif
-opt_nfs.h opt_vmpage.h:
+opt_nfs.h opt_vmpage.h opt_posix.h:
touch ${.TARGET}
.include <bsd.kmod.mk>
diff --git a/sys/modules/nfsclient/Makefile b/sys/modules/nfsclient/Makefile
index 71b19a9..719adcd 100644
--- a/sys/modules/nfsclient/Makefile
+++ b/sys/modules/nfsclient/Makefile
@@ -1,15 +1,15 @@
-# $Id$
+# $Id: Makefile,v 1.10 1998/07/07 02:27:09 bde Exp $
-.PATH: ${.CURDIR}/../../sys/nfs
-KMOD= nfs_mod
+.PATH: ${.CURDIR}/../../nfs
+KMOD= nfs
SRCS= nfs_bio.c nfs_node.c nfs_nqlease.c nfs_serv.c nfs_socket.c \
nfs_srvcache.c nfs_subs.c nfs_syscalls.c nfs_vfsops.c \
nfs_vnops.c opt_inet.h opt_nfs.h opt_vmpage.h
NFS_INET?= 1 # 0/1 - requires INET to be configured in kernel
NOMAN=
-VFS_LKM=
+VFS_KLD=
CFLAGS+= -DNFS
-CLEANFILES= opt_inet.h opt_nfs.h opt_vmpage.h
+CLEANFILES= opt_inet.h opt_nfs.h opt_vmpage.h opt_posix.h
opt_inet.h:
touch ${.TARGET}
@@ -17,7 +17,7 @@ opt_inet.h:
echo "#define INET 1" > ${.TARGET}
.endif
-opt_nfs.h opt_vmpage.h:
+opt_nfs.h opt_vmpage.h opt_posix.h:
touch ${.TARGET}
.include <bsd.kmod.mk>
diff --git a/sys/modules/nfsserver/Makefile b/sys/modules/nfsserver/Makefile
index 71b19a9..719adcd 100644
--- a/sys/modules/nfsserver/Makefile
+++ b/sys/modules/nfsserver/Makefile
@@ -1,15 +1,15 @@
-# $Id$
+# $Id: Makefile,v 1.10 1998/07/07 02:27:09 bde Exp $
-.PATH: ${.CURDIR}/../../sys/nfs
-KMOD= nfs_mod
+.PATH: ${.CURDIR}/../../nfs
+KMOD= nfs
SRCS= nfs_bio.c nfs_node.c nfs_nqlease.c nfs_serv.c nfs_socket.c \
nfs_srvcache.c nfs_subs.c nfs_syscalls.c nfs_vfsops.c \
nfs_vnops.c opt_inet.h opt_nfs.h opt_vmpage.h
NFS_INET?= 1 # 0/1 - requires INET to be configured in kernel
NOMAN=
-VFS_LKM=
+VFS_KLD=
CFLAGS+= -DNFS
-CLEANFILES= opt_inet.h opt_nfs.h opt_vmpage.h
+CLEANFILES= opt_inet.h opt_nfs.h opt_vmpage.h opt_posix.h
opt_inet.h:
touch ${.TARGET}
@@ -17,7 +17,7 @@ opt_inet.h:
echo "#define INET 1" > ${.TARGET}
.endif
-opt_nfs.h opt_vmpage.h:
+opt_nfs.h opt_vmpage.h opt_posix.h:
touch ${.TARGET}
.include <bsd.kmod.mk>
diff --git a/sys/modules/nullfs/Makefile b/sys/modules/nullfs/Makefile
index e4e684a..4b19576 100644
--- a/sys/modules/nullfs/Makefile
+++ b/sys/modules/nullfs/Makefile
@@ -1,10 +1,10 @@
-# $Id: Makefile,v 1.5 1998/02/04 21:56:37 eivind Exp $
+# $Id: Makefile,v 1.6 1998/02/06 23:54:26 eivind Exp $
-.PATH: ${.CURDIR}/../../sys/miscfs/nullfs
-KMOD= null_mod
+.PATH: ${.CURDIR}/../../miscfs/nullfs
+KMOD= null
SRCS= null_subr.c null_vfsops.c null_vnops.c opt_debug_nullfs.h
NOMAN=
-VFS_LKM=
+VFS_KLD=
CFLAGS+= -DNULLFS
CLEANFILES= opt_debug_nullfs.h
diff --git a/sys/modules/pcic/Makefile b/sys/modules/pcic/Makefile
index 60f7f90..0c8c204 100644
--- a/sys/modules/pcic/Makefile
+++ b/sys/modules/pcic/Makefile
@@ -1,10 +1,9 @@
-# $Id$
+# $Id: Makefile,v 1.6 1997/02/22 12:48:45 peter Exp $
-.PATH: ${.CURDIR}/../../sys/pccard
-KMOD= pcic_mod
+.PATH: ${.CURDIR}/../../pccard
+KMOD= pcic
SRCS= pcic.c
NOMAN=
-PSEUDO_LKM=
CFLAGS+= -DLKM
.include <bsd.kmod.mk>
diff --git a/sys/modules/portal/Makefile b/sys/modules/portal/Makefile
index 4d503f7..0d35dd9 100644
--- a/sys/modules/portal/Makefile
+++ b/sys/modules/portal/Makefile
@@ -1,10 +1,10 @@
-# $Id$
+# $Id: Makefile,v 1.3 1997/02/22 12:48:47 peter Exp $
-.PATH: ${.CURDIR}/../../sys/miscfs/portal
-KMOD= portal_mod
+.PATH: ${.CURDIR}/../../miscfs/portal
+KMOD= portal
SRCS= portal_vfsops.c portal_vnops.c
NOMAN=
-VFS_LKM=
+VFS_KLD=
CFLAGS+= -DPORTAL
.include <bsd.kmod.mk>
diff --git a/sys/modules/portalfs/Makefile b/sys/modules/portalfs/Makefile
index 4d503f7..0d35dd9 100644
--- a/sys/modules/portalfs/Makefile
+++ b/sys/modules/portalfs/Makefile
@@ -1,10 +1,10 @@
-# $Id$
+# $Id: Makefile,v 1.3 1997/02/22 12:48:47 peter Exp $
-.PATH: ${.CURDIR}/../../sys/miscfs/portal
-KMOD= portal_mod
+.PATH: ${.CURDIR}/../../miscfs/portal
+KMOD= portal
SRCS= portal_vfsops.c portal_vnops.c
NOMAN=
-VFS_LKM=
+VFS_KLD=
CFLAGS+= -DPORTAL
.include <bsd.kmod.mk>
diff --git a/sys/modules/procfs/Makefile b/sys/modules/procfs/Makefile
index 59089e5..b7b5bd1 100644
--- a/sys/modules/procfs/Makefile
+++ b/sys/modules/procfs/Makefile
@@ -1,11 +1,11 @@
-# $Id: Makefile,v 1.11 1998/07/25 15:52:43 alex Exp $
+# $Id: Makefile,v 1.12 1998/07/27 01:07:00 alex Exp $
-.PATH: ${.CURDIR}/../../sys/miscfs/procfs
-KMOD= procfs_mod
+.PATH: ${.CURDIR}/../../miscfs/procfs
+KMOD= procfs
SRCS= opt_vmpage.h procfs_ctl.c procfs_map.c procfs_note.c procfs_status.c \
procfs_subr.c procfs_type.c procfs_vfsops.c procfs_vnops.c
NOMAN=
-VFS_LKM=
+VFS_KLD=
CFLAGS+= -DPROCFS
CLEANFILES+= opt_vmpage.h
diff --git a/sys/modules/syscons/Makefile.inc b/sys/modules/syscons/Makefile.inc
new file mode 100644
index 0000000..60392e0
--- /dev/null
+++ b/sys/modules/syscons/Makefile.inc
@@ -0,0 +1,3 @@
+# $Id$
+
+.include "../Makefile.inc"
diff --git a/sys/modules/syscons/blank/Makefile b/sys/modules/syscons/blank/Makefile
index 7289b03..4f88186 100644
--- a/sys/modules/syscons/blank/Makefile
+++ b/sys/modules/syscons/blank/Makefile
@@ -1,6 +1,6 @@
-# $Id: Makefile,v 1.6 1997/07/15 14:49:08 yokota Exp $
+# $Id: Makefile,v 1.7 1998/02/01 17:59:51 bde Exp $
-KMOD= blank_saver_mod
+KMOD= blank_saver
SRCS= blank_saver.c
NOMAN=
diff --git a/sys/modules/syscons/daemon/Makefile b/sys/modules/syscons/daemon/Makefile
index d823bfd..4f0e6a3 100644
--- a/sys/modules/syscons/daemon/Makefile
+++ b/sys/modules/syscons/daemon/Makefile
@@ -1,6 +1,6 @@
-# $Id: Makefile,v 1.3 1997/07/15 14:49:13 yokota Exp $
+# $Id: Makefile,v 1.4 1998/02/01 17:59:52 bde Exp $
-KMOD= daemon_saver_mod
+KMOD= daemon_saver
SRCS= daemon_saver.c
NOMAN=
diff --git a/sys/modules/syscons/fade/Makefile b/sys/modules/syscons/fade/Makefile
index f9b8030..d5ac406 100644
--- a/sys/modules/syscons/fade/Makefile
+++ b/sys/modules/syscons/fade/Makefile
@@ -1,6 +1,6 @@
-# $Id: Makefile,v 1.6 1997/07/15 14:49:23 yokota Exp $
+# $Id: Makefile,v 1.7 1998/02/01 17:59:53 bde Exp $
-KMOD= fade_saver_mod
+KMOD= fade_saver
SRCS= fade_saver.c
NOMAN=
diff --git a/sys/modules/syscons/green/Makefile b/sys/modules/syscons/green/Makefile
index 2ffe190..9d8d1a3 100644
--- a/sys/modules/syscons/green/Makefile
+++ b/sys/modules/syscons/green/Makefile
@@ -1,6 +1,6 @@
-# $Id: Makefile,v 1.6 1997/07/15 14:49:27 yokota Exp $
+# $Id: Makefile,v 1.7 1998/02/01 17:59:54 bde Exp $
-KMOD= green_saver_mod
+KMOD= green_saver
SRCS= green_saver.c
NOMAN=
diff --git a/sys/modules/syscons/snake/Makefile b/sys/modules/syscons/snake/Makefile
index 16006a7..88a7bfc 100644
--- a/sys/modules/syscons/snake/Makefile
+++ b/sys/modules/syscons/snake/Makefile
@@ -1,6 +1,6 @@
-# $Id: Makefile,v 1.6 1997/07/15 14:49:33 yokota Exp $
+# $Id: Makefile,v 1.7 1998/02/01 17:59:58 bde Exp $
-KMOD= snake_saver_mod
+KMOD= snake_saver
SRCS= snake_saver.c
NOMAN=
diff --git a/sys/modules/syscons/star/Makefile b/sys/modules/syscons/star/Makefile
index f8f8522..02a8456 100644
--- a/sys/modules/syscons/star/Makefile
+++ b/sys/modules/syscons/star/Makefile
@@ -1,6 +1,6 @@
-# $Id: Makefile,v 1.6 1997/07/15 14:49:38 yokota Exp $
+# $Id: Makefile,v 1.7 1998/02/01 17:59:59 bde Exp $
-KMOD= star_saver_mod
+KMOD= star_saver
SRCS= star_saver.c
NOMAN=
diff --git a/sys/modules/umapfs/Makefile b/sys/modules/umapfs/Makefile
index eb333da6..6a1332c 100644
--- a/sys/modules/umapfs/Makefile
+++ b/sys/modules/umapfs/Makefile
@@ -1,10 +1,10 @@
-# $Id$
+# $Id: Makefile,v 1.3 1997/02/22 12:49:25 peter Exp $
-.PATH: ${.CURDIR}/../../sys/miscfs/umapfs
-KMOD= umap_mod
+.PATH: ${.CURDIR}/../../miscfs/umapfs
+KMOD= umap
SRCS= umap_subr.c umap_vfsops.c umap_vnops.c
NOMAN=
-VFS_LKM= yes
+VFS_KLD= yes
CFLAGS+= -DUMAPFS
.include <bsd.kmod.mk>
diff --git a/sys/modules/union/Makefile b/sys/modules/union/Makefile
index 5636659..defca0b 100644
--- a/sys/modules/union/Makefile
+++ b/sys/modules/union/Makefile
@@ -1,10 +1,10 @@
-# $Id$
+# $Id: Makefile,v 1.3 1997/02/22 12:49:27 peter Exp $
-.PATH: ${.CURDIR}/../../sys/miscfs/union
-KMOD= union_mod
+.PATH: ${.CURDIR}/../../miscfs/union
+KMOD= union
SRCS= union_subr.c union_vfsops.c union_vnops.c
NOMAN=
-VFS_LKM=
+VFS_KLD=
CFLAGS+= -DUNION
.include <bsd.kmod.mk>
diff --git a/sys/modules/unionfs/Makefile b/sys/modules/unionfs/Makefile
index 5636659..defca0b 100644
--- a/sys/modules/unionfs/Makefile
+++ b/sys/modules/unionfs/Makefile
@@ -1,10 +1,10 @@
-# $Id$
+# $Id: Makefile,v 1.3 1997/02/22 12:49:27 peter Exp $
-.PATH: ${.CURDIR}/../../sys/miscfs/union
-KMOD= union_mod
+.PATH: ${.CURDIR}/../../miscfs/union
+KMOD= union
SRCS= union_subr.c union_vfsops.c union_vnops.c
NOMAN=
-VFS_LKM=
+VFS_KLD=
CFLAGS+= -DUNION
.include <bsd.kmod.mk>
diff --git a/sys/modules/vesa/Makefile b/sys/modules/vesa/Makefile
index ae9662f..62dd4bc 100644
--- a/sys/modules/vesa/Makefile
+++ b/sys/modules/vesa/Makefile
@@ -1,7 +1,7 @@
-# $Id: Makefile,v 1.1 1998/09/15 20:09:18 sos Exp $
+# $Id: Makefile,v 1.2 1998/09/15 20:14:11 sos Exp $
-.PATH: ${.CURDIR}/../../sys/i386/isa
-KMOD = vesa_mod
+.PATH: ${.CURDIR}/../../i386/isa
+KMOD = vesa
SRCS = vesa.c scvesactl.c sc.h opt_vesa.h opt_vm86.h
NOMAN =
CFLAGS += -DVESA_MODULE
diff --git a/sys/modules/vinum/Makefile b/sys/modules/vinum/Makefile
index f1f4bb7..6489222 100644
--- a/sys/modules/vinum/Makefile
+++ b/sys/modules/vinum/Makefile
@@ -1,12 +1,11 @@
-# $Id: Makefile,v 1.1.1.1 1998/09/16 05:56:21 grog Exp $
+# $Id: Makefile,v 1.2 1998/09/28 04:21:20 grog Exp $
-.PATH: ${.CURDIR}/../../sys/dev/ccd
-KMOD= vinum_mod
+.PATH: ${.CURDIR}/../../dev/ccd
+KMOD= vinum
SRCS= vinum.c vinum.h vnode_if.h parser.c config.c io.c util.c vinumhdr.h request.h \
state.c memory.c request.c lock.c vinumext.h vinumio.h vinumkw.h \
vinumstate.h vinumvar.h revive.c vinumioctl.c interrupt.c
NOMAN=
-PSEUDO_LKM=
CFLAGS = -I${.CURDIR} -O -g -I/usr/include/machine -DDEBUG -Wall -Wno-unused -Wno-parentheses
CLEANFILES+= vinum.h vnode_if.h vnode_if.c
diff --git a/sys/modules/vinum/vinum.c b/sys/modules/vinum/vinum.c
index bffdf6d..62c6b3f 100644
--- a/sys/modules/vinum/vinum.c
+++ b/sys/modules/vinum/vinum.c
@@ -33,7 +33,7 @@
* otherwise) arising in any way out of the use of this software, even if
* advised of the possibility of such damage.
*
- * $Id: vinum.c,v 1.19 1998/08/13 05:24:02 grog Exp grog $
+ * $Id: vinum.c,v 1.1.1.1 1998/09/16 05:56:21 grog Exp $
*/
#define STATIC /* nothing while we're testing XXX */
@@ -161,8 +161,6 @@ vinumattach(void *dummy)
}
-#ifdef ACTUALLY_LKM_NOT_KERNEL /* stuff for LKMs */
-
/* Check if we have anything open. If so, return 0 (not inactive),
* otherwise 1 (inactive) */
int
@@ -228,6 +226,7 @@ free_vinum(int cleardrive)
bzero(&vinum_conf, sizeof(vinum_conf));
}
+#ifdef ACTUALLY_LKM_NOT_KERNEL /* stuff for LKMs */
MOD_MISC(vinum);
/*
@@ -289,7 +288,39 @@ vinum_mod(struct lkm_table *lkmtp, int cmd, int ver)
}
#else /* not LKM */
-#error "This driver must be compiled as a loadable kernel module"
+
+STATIC int vinum_modevent(module_t mod, modeventtype_t type, void *unused);
+STATIC int
+vinum_modevent(module_t mod, modeventtype_t type, void *unused)
+{
+ struct sync_args dummyarg = {0};
+
+ BROKEN_GDB;
+ switch (type) {
+ case MOD_LOAD:
+ /* Debugger ("vinum_load"); */
+ vinumattach(NULL);
+ return 0; /* OK */
+ case MOD_UNLOAD:
+ if (!vinum_inactive()) /* is anything open? */
+ return EBUSY;
+ sync(curproc, &dummyarg); /* write out buffers */
+ free_vinum(0); /* no: clean up */
+ cdevsw[CDEV_MAJOR] = NULL; /* and cdevsw */
+ return 0;
+ default:
+ break;
+ }
+ return 0;
+}
+
+moduledata_t vinum_mod = {
+ "vinum",
+ vinum_modevent,
+ 0
+};
+DECLARE_MODULE(vinum, vinum_mod, SI_SUB_DRIVERS, SI_ORDER_MIDDLE);
+
#endif /* LKM */
/* ARGSUSED */
diff --git a/sys/modules/wcd/Makefile b/sys/modules/wcd/Makefile
index 0d83429..9f1dfb1 100644
--- a/sys/modules/wcd/Makefile
+++ b/sys/modules/wcd/Makefile
@@ -1,7 +1,7 @@
-# $Id: Makefile,v 1.10 1998/02/01 17:53:56 bde Exp $
+# $Id: Makefile,v 1.11 1998/02/25 01:40:55 bde Exp $
-.PATH: ${.CURDIR}/../../sys/i386/isa
-KMOD = wcd_mod
+.PATH: ${.CURDIR}/../../i386/isa
+KMOD = wcd
SRCS = wcd.c wdc.h wcd.h opt_atapi.h opt_devfs.h
NOMAN =
CFLAGS += -DWCD_MODULE
OpenPOWER on IntegriCloud