Thu Oct 2 21:01:38 2014 UTC ()
devmajor_t not int


(justin)
diff -r1.90 -r1.91 src/sys/dev/cgd.c
diff -r1.34 -r1.35 src/sys/dev/dm/device-mapper.c

cvs diff -r1.90 -r1.91 src/sys/dev/cgd.c (expand / switch to context diff)
--- src/sys/dev/cgd.c 2014/07/25 08:10:35 1.90
+++ src/sys/dev/cgd.c 2014/10/02 21:01:38 1.91
@@ -1,4 +1,4 @@
-/* $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.
@@ -30,7 +30,7 @@
  */
 
 #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>
@@ -1006,7 +1006,7 @@
 	int error = 0;
 
 #ifdef _MODULE
-	int bmajor = -1, cmajor = -1;
+	devmajor_t bmajor = -1, cmajor = -1;
 #endif
 
 	switch (cmd) {

cvs diff -r1.34 -r1.35 src/sys/dev/dm/device-mapper.c (expand / switch to context diff)
--- src/sys/dev/dm/device-mapper.c 2014/07/25 08:10:36 1.34
+++ src/sys/dev/dm/device-mapper.c 2014/10/02 21:01:38 1.35
@@ -1,4 +1,4 @@
-/*        $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.
@@ -156,7 +156,8 @@
 dm_modcmd(modcmd_t cmd, void *arg)
 {
 #ifdef _MODULE
-	int error, bmajor, cmajor;
+	int error;
+	devmajor_t bmajor, cmajor;
 
 	error = 0;
 	bmajor = -1;