 @@ -1,14 +1,14 @@
-/* $NetBSD: cgd.c,v 1.90 2014/07/25 08:10:35 dholland Exp $ */
+/* $NetBSD: cgd.c,v 1.91 2014/10/02 21:01:38 justin Exp $ */
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Roland C. Dowdeswell.
+ *
  * 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.
 @@ -20,27 +20,27 @@
  * ``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 FOUNDATION OR CONTRIBUTORS
  * 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.90 2014/07/25 08:10:35 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.91 2014/10/02 21:01:38 justin Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/errno.h>
 #include <sys/buf.h>
 #include <sys/bufq.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/pool.h>
 #include <sys/ioctl.h>
 #include <sys/device.h>
 @@ -996,27 +996,27 @@ hexprint(const char *start, void *buf, i
 MODULE(MODULE_CLASS_DRIVER, cgd, "dk_subr");
 #ifdef _MODULE
 CFDRIVER_DECL(cgd, DV_DISK, NULL);
 #endif
 static int
 cgd_modcmd(modcmd_t cmd, void *arg)
+{
 	int error = 0;
 #ifdef _MODULE
-	int bmajor = -1, cmajor = -1;
+	devmajor_t bmajor = -1, cmajor = -1;
 #endif
 	switch (cmd) {
 	case MODULE_CMD_INIT:
 #ifdef _MODULE
 		error = config_cfdriver_attach(&cgd_cd);
 		if (error)
 			break;
 		error = config_cfattach_attach(cgd_cd.cd_name, &cgd_ca);
 	        if (error) {
 			config_cfdriver_detach(&cgd_cd);
 			aprint_error("%s: unable to register cfattach\n",

 @@ -1,14 +1,14 @@
-/*        $NetBSD: device-mapper.c,v 1.34 2014/07/25 08:10:36 dholland Exp $ */
+/*        $NetBSD: device-mapper.c,v 1.35 2014/10/02 21:01:38 justin Exp $ */
 /*
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Adam Hamsik.
+ *
  * 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.
 @@ -146,27 +146,28 @@ static const struct cmd_function cmd_fn[
 #ifdef _MODULE
 #include <sys/module.h>
 /* Autoconf defines */
 CFDRIVER_DECL(dm, DV_DISK, NULL);
 MODULE(MODULE_CLASS_DRIVER, dm, "dk_subr");
 /* New module handle routine */
 static int
 dm_modcmd(modcmd_t cmd, void *arg)
+{
 #ifdef _MODULE
-	int error, bmajor, cmajor;
+	int error;
 	devmajor_t bmajor, cmajor;
 	error = 0;
 	bmajor = -1;
 	cmajor = -1;
 	switch (cmd) {
 	case MODULE_CMD_INIT:
 		error = config_cfdriver_attach(&dm_cd);
 		if (error)
 			break;
 		error = config_cfattach_attach(dm_cd.cd_name, &dm_ca);
 		if (error) {