summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorpgoyette <pgoyette@NetBSD.org>2013-12-28 19:25:07 +0000
committerpgoyette <pgoyette@NetBSD.org>2013-12-28 19:25:07 +0000
commitdbeb990bd423060764d10d5c774e5fb407ba3786 (patch)
treecb47e02d9c2dd1aa1b8ad3696a639def259426e7 /sys/dev
parent092a2f69ffac60da564b2ec295f415ec870a1844 (diff)
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.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/cgd.c6
-rw-r--r--sys/dev/dksubr.c23
-rw-r--r--sys/dev/dm/device-mapper.c4
3 files changed, 26 insertions, 7 deletions
diff --git a/sys/dev/cgd.c b/sys/dev/cgd.c
index 7697df87ac4..63f88aa3750 100644
--- a/sys/dev/cgd.c
+++ b/sys/dev/cgd.c
@@ -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, int len)
}
#endif
-MODULE(MODULE_CLASS_DRIVER, cgd, NULL);
+MODULE(MODULE_CLASS_DRIVER, cgd, "dk_subr");
#ifdef _MODULE
CFDRIVER_DECL(cgd, DV_DISK, NULL);
diff --git a/sys/dev/dksubr.c b/sys/dev/dksubr.c
index 9345b4fdeb5..850f3685d8c 100644
--- a/sys/dev/dksubr.c
+++ b/sys/dev/dksubr.c
@@ -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.48 2013/05/29 23:37:10 christos Exp $")
#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;
+ }
+}
diff --git a/sys/dev/dm/device-mapper.c b/sys/dev/dm/device-mapper.c
index 39f4ccbd13e..7165b04abe2 100644
--- a/sys/dev/dm/device-mapper.c
+++ b/sys/dev/dm/device-mapper.c
@@ -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