Module Name: src
Committed By: pgoyette
Date: Sat Dec 28 19:25:07 UTC 2013
Modified Files:
src/sys/dev: cgd.c dksubr.c
src/sys/dev/dm: device-mapper.c
src/sys/modules: Makefile
Added Files:
src/sys/modules/dk_subr: Makefile
Log Message:
Make dksubr.c into a module, and make the cgd and dm modules depend on
it.
Now that cgd is completely modularized, descend into modules/cgd to
actually create the module.
To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/sys/dev/cgd.c
cvs rdiff -u -r1.48 -r1.49 src/sys/dev/dksubr.c
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/dm/device-mapper.c
cvs rdiff -u -r1.128 -r1.129 src/sys/modules/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/dk_subr/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/cgd.c
diff -u src/sys/dev/cgd.c:1.82 src/sys/dev/cgd.c:1.83
--- src/sys/dev/cgd.c:1.82 Thu Sep 12 12:28:49 2013
+++ src/sys/dev/cgd.c Sat Dec 28 19:25:07 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cgd.c,v 1.82 2013/09/12 12:28:49 martin Exp $ */
+/* $NetBSD: cgd.c,v 1.83 2013/12/28 19:25:07 pgoyette Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.82 2013/09/12 12:28:49 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.83 2013/12/28 19:25:07 pgoyette Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -973,7 +973,7 @@ hexprint(const char *start, void *buf, i
}
#endif
-MODULE(MODULE_CLASS_DRIVER, cgd, NULL);
+MODULE(MODULE_CLASS_DRIVER, cgd, "dk_subr");
#ifdef _MODULE
CFDRIVER_DECL(cgd, DV_DISK, NULL);
Index: src/sys/dev/dksubr.c
diff -u src/sys/dev/dksubr.c:1.48 src/sys/dev/dksubr.c:1.49
--- src/sys/dev/dksubr.c:1.48 Wed May 29 23:37:10 2013
+++ src/sys/dev/dksubr.c Sat Dec 28 19:25:07 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dksubr.c,v 1.48 2013/05/29 23:37:10 christos Exp $ */
+/* $NetBSD: dksubr.c,v 1.49 2013/12/28 19:25:07 pgoyette Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999, 2002, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.48 2013/05/29 23:37:10 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.49 2013/12/28 19:25:07 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -45,6 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1
#include <sys/vnode.h>
#include <sys/fcntl.h>
#include <sys/namei.h>
+#include <sys/module.h>
#include <dev/dkvar.h>
@@ -64,6 +65,8 @@ int dkdebug = 0;
#define DPRINTF_FOLLOW(y)
#endif
+static int dk_subr_modcmd(modcmd_t, void *);
+
#define DKLABELDEV(dev) \
(MAKEDISKDEV(major((dev)), DISKUNIT((dev)), RAW_PART))
@@ -680,3 +683,19 @@ out:
(void) vn_close(vp, FREAD | FWRITE, l->l_cred);
return error;
}
+
+MODULE(MODULE_CLASS_MISC, dk_subr, NULL);
+
+static int
+dk_subr_modcmd(modcmd_t cmd, void *arg)
+{
+ switch (cmd) {
+ case MODULE_CMD_INIT:
+ case MODULE_CMD_FINI:
+ return 0;
+ case MODULE_CMD_STAT:
+ case MODULE_CMD_AUTOUNLOAD:
+ default:
+ return ENOTTY;
+ }
+}
Index: src/sys/dev/dm/device-mapper.c
diff -u src/sys/dev/dm/device-mapper.c:1.31 src/sys/dev/dm/device-mapper.c:1.32
--- src/sys/dev/dm/device-mapper.c:1.31 Fri Oct 18 19:56:30 2013
+++ src/sys/dev/dm/device-mapper.c Sat Dec 28 19:25:07 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: device-mapper.c,v 1.31 2013/10/18 19:56:30 christos Exp $ */
+/* $NetBSD: device-mapper.c,v 1.32 2013/12/28 19:25:07 pgoyette Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -147,7 +147,7 @@ static const struct cmd_function cmd_fn[
/* Autoconf defines */
CFDRIVER_DECL(dm, DV_DISK, NULL);
-MODULE(MODULE_CLASS_DRIVER, dm, NULL);
+MODULE(MODULE_CLASS_DRIVER, dm, "dk_subr");
/* New module handle routine */
static int
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.128 src/sys/modules/Makefile:1.129
--- src/sys/modules/Makefile:1.128 Mon Dec 16 23:54:26 2013
+++ src/sys/modules/Makefile Sat Dec 28 19:25:07 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.128 2013/12/16 23:54:26 lneto Exp $
+# $NetBSD: Makefile,v 1.129 2013/12/28 19:25:07 pgoyette Exp $
.include <bsd.own.mk>
@@ -10,6 +10,7 @@ SUBDIR+= adosfs
SUBDIR+= aio
SUBDIR+= bpf
SUBDIR+= cd9660
+SUBDIR+= cgd
SUBDIR+= coda
SUBDIR+= coda5
SUBDIR+= compat
@@ -17,6 +18,7 @@ SUBDIR+= compat_ossaudio
SUBDIR+= coredump
SUBDIR+= chfs
SUBDIR+= dbcool
+SUBDIR+= dk_subr
SUBDIR+= efs
SUBDIR+= ext2fs
SUBDIR+= exec_script
Added files:
Index: src/sys/modules/dk_subr/Makefile
diff -u /dev/null src/sys/modules/dk_subr/Makefile:1.1
--- /dev/null Sat Dec 28 19:25:07 2013
+++ src/sys/modules/dk_subr/Makefile Sat Dec 28 19:25:07 2013
@@ -0,0 +1,10 @@
+# $NetBSD: Makefile,v 1.1 2013/12/28 19:25:07 pgoyette Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/dev
+
+KMOD= dk_subr
+SRCS= dksubr.c
+
+.include <bsd.kmodule.mk>
