7 files changed, 16 insertions, 16 deletions

diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index 5a9d93c4f4d34..47947d1d12644 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/fdc.c
@@ -43,7 +43,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.112 1998/05/06 23:35:36 julian Exp $
+ *	$Id: fd.c,v 1.113 1998/06/07 17:10:20 dfr Exp $
  *
  */
 
@@ -2074,7 +2074,7 @@ fdioctl(dev, cmd, addr, flag, p)
  * Slice ioctls come here
  */
 static int
-fdsioctl( void *private, int cmd, caddr_t addr, int flag, struct proc *p)
+fdsioctl( void *private, u_long cmd, caddr_t addr, int flag, struct proc *p)
 {
 	struct	subdev *sd = private;
  	fd_p	fd	= sd->drive;
diff --git a/sys/dev/slice/disklabel.c b/sys/dev/slice/disklabel.c
index 31bd6d1538baa..57d3c2a04d355 100644
--- a/sys/dev/slice/disklabel.c
+++ b/sys/dev/slice/disklabel.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- *	$Id: disklabel.c,v 1.4 1998/05/06 22:14:31 julian Exp $
+ *	$Id: disklabel.c,v 1.5 1998/05/06 23:32:47 julian Exp $
  */
 #define BAD144
 
@@ -778,7 +778,7 @@ RR;
 #endif	/* 0 */
 
 static int
-dkl_ioctl(void *private, int cmd, caddr_t addr, int flag, struct proc * p)
+dkl_ioctl(void *private, u_long cmd, caddr_t addr, int flag, struct proc * p)
 {
 	register struct private_data *pd;
 	struct subdev *sdp;
@@ -857,7 +857,7 @@ static struct disklabel static_label;
  * knows about disklabels.
  */
 int
-dkl_dummy_ioctl(struct slice *slice, int cmd, caddr_t addr,
+dkl_dummy_ioctl(struct slice *slice, u_long cmd, caddr_t addr,
 					int flag, struct proc * p)
 {
 	struct disklabel *lp = &static_label;
diff --git a/sys/dev/slice/mbr.c b/sys/dev/slice/mbr.c
index 8efd3f3efb775..f462887d2990e 100644
--- a/sys/dev/slice/mbr.c
+++ b/sys/dev/slice/mbr.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- *	$Id: mbr.c,v 1.4 1998/05/06 22:14:32 julian Exp $
+ *	$Id: mbr.c,v 1.5 1998/05/06 23:32:48 julian Exp $
  */
 
 #include <sys/param.h>
@@ -807,7 +807,7 @@ RR;
 #endif /* 0 */
 
 static int
-mbr_ioctl(void *private, int cmd, caddr_t addr, int flag, struct proc * p)
+mbr_ioctl(void *private, u_long cmd, caddr_t addr, int flag, struct proc * p)
 {
 	register struct private_data *pd;
 	struct subdev *sdp;
diff --git a/sys/dev/slice/slice.h b/sys/dev/slice/slice.h
index ee7cd36f75a4c..3d7eabd679e3b 100644
--- a/sys/dev/slice/slice.h
+++ b/sys/dev/slice/slice.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- *	$Id: slice.h,v 1.1 1998/04/19 23:31:10 julian Exp $
+ *	$Id: slice.h,v 1.2 1998/05/06 22:14:33 julian Exp $
  */
 
 typedef struct slice_handler *sh_p;
@@ -114,7 +114,7 @@ struct slice {
  * prototypes for slice methods
  */
 typedef void	sl_h_IO_req_t(void *private, struct buf * buf);
-typedef int	sl_h_ioctl_t(void *private, int cmd, caddr_t data,
+typedef int	sl_h_ioctl_t(void *private, u_long cmd, caddr_t data,
 	     			int fflag, struct proc * p);
 typedef int	sl_h_constructor_t(sl_p slice);
 typedef int	sl_h_open_t(void *private, int flags, int mode, struct proc * p);
@@ -184,7 +184,7 @@ int dkl_geom_hack(struct slice * slice, struct ide_geom *geom);
  * Lives in disklabel.c because that's where everyhting is in scope,
  * but is used in slice_device.c.  XXX hack.
  */
-int dkl_dummy_ioctl(struct slice *slice, int cmd, caddr_t addr,
+int dkl_dummy_ioctl(struct slice *slice, u_long cmd, caddr_t addr,
 					int flag, struct proc * p);
 
 /*
diff --git a/sys/i386/isa/fd.c b/sys/i386/isa/fd.c
index 5a9d93c4f4d34..47947d1d12644 100644
--- a/sys/i386/isa/fd.c
+++ b/sys/i386/isa/fd.c
@@ -43,7 +43,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.112 1998/05/06 23:35:36 julian Exp $
+ *	$Id: fd.c,v 1.113 1998/06/07 17:10:20 dfr Exp $
  *
  */
 
@@ -2074,7 +2074,7 @@ fdioctl(dev, cmd, addr, flag, p)
  * Slice ioctls come here
  */
 static int
-fdsioctl( void *private, int cmd, caddr_t addr, int flag, struct proc *p)
+fdsioctl( void *private, u_long cmd, caddr_t addr, int flag, struct proc *p)
 {
 	struct	subdev *sd = private;
  	fd_p	fd	= sd->drive;
diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c
index 367dfb918a5d3..2460f137e67c7 100644
--- a/sys/i386/isa/wd.c
+++ b/sys/i386/isa/wd.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)wd.c	7.2 (Berkeley) 5/9/91
- *	$Id: wd.c,v 1.167 1998/05/11 15:30:43 sos Exp $
+ *	$Id: wd.c,v 1.168 1998/06/07 17:11:05 dfr Exp $
  */
 
 /* TODO:
@@ -2775,7 +2775,7 @@ wdsclose(void *private, int flags, int mode, struct proc *p)
 #endif /* 0 */
 
 static int
-wdsioctl( void *private, int cmd, caddr_t addr, int flag, struct proc *p)
+wdsioctl( void *private, u_long cmd, caddr_t addr, int flag, struct proc *p)
 {
 	register struct disk *du = private;
 #ifdef notyet
diff --git a/sys/isa/fd.c b/sys/isa/fd.c
index 5a9d93c4f4d34..47947d1d12644 100644
--- a/sys/isa/fd.c
+++ b/sys/isa/fd.c
@@ -43,7 +43,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.112 1998/05/06 23:35:36 julian Exp $
+ *	$Id: fd.c,v 1.113 1998/06/07 17:10:20 dfr Exp $
  *
  */
 
@@ -2074,7 +2074,7 @@ fdioctl(dev, cmd, addr, flag, p)
  * Slice ioctls come here
  */
 static int
-fdsioctl( void *private, int cmd, caddr_t addr, int flag, struct proc *p)
+fdsioctl( void *private, u_long cmd, caddr_t addr, int flag, struct proc *p)
 {
 	struct	subdev *sd = private;
  	fd_p	fd	= sd->drive;