13 files changed, 23 insertions, 23 deletions

diff --git a/sys/dev/raidframe/rf_freebsdkintf.c b/sys/dev/raidframe/rf_freebsdkintf.c
index ad6ea113cf63..91454a07cc24 100644
--- a/sys/dev/raidframe/rf_freebsdkintf.c
+++ b/sys/dev/raidframe/rf_freebsdkintf.c
@@ -1971,7 +1971,7 @@ raidread_component_label(dev, b_vp, clabel)
 	bp->b_iocmd = BIO_READ;
  	bp->b_resid = RF_COMPONENT_INFO_SIZE / DEV_BSIZE;
 
-	DEV_STRATEGY(bp, 0);
+	DEV_STRATEGY(bp);
 	error = bufwait(bp); 
 
 	if (!error) {
@@ -2014,7 +2014,7 @@ raidwrite_component_label(dev, b_vp, clabel)
 
 	memcpy(bp->b_data, clabel, sizeof(RF_ComponentLabel_t));
 
-	DEV_STRATEGY(bp, 0);
+	DEV_STRATEGY(bp);
 	error = bufwait(bp); 
 
 	bp->b_flags |= B_INVAL | B_AGE;
diff --git a/sys/dev/vinum/vinumdaemon.c b/sys/dev/vinum/vinumdaemon.c
index 16036e88b20f..a98977eb2c34 100644
--- a/sys/dev/vinum/vinumdaemon.c
+++ b/sys/dev/vinum/vinumdaemon.c
@@ -210,7 +210,7 @@ recover_io(struct request *rq)
      *
      * Negotiate with phk to get it fixed.
      */
-    DEV_STRATEGY(rq->bp, 0);				    /* reissue the command */
+    DEV_STRATEGY(rq->bp);				    /* reissue the command */
 }
 
 /* Functions called to interface with the daemon */
diff --git a/sys/dev/vinum/vinuminterrupt.c b/sys/dev/vinum/vinuminterrupt.c
index fdefee4d2b9a..8d72579af8cf 100644
--- a/sys/dev/vinum/vinuminterrupt.c
+++ b/sys/dev/vinum/vinuminterrupt.c
@@ -420,7 +420,7 @@ complete_raid5_write(struct rqelement *rqe)
 		    if (debug & DEBUG_LASTREQS)
 			logrq(loginfo_raid5_data, (union rqinfou) rqe, ubp);
 #endif
-		    DEV_STRATEGY(&rqe->b, 0);
+		    DEV_STRATEGY(&rqe->b);
 		}
 	    }
 	}
@@ -459,7 +459,7 @@ complete_raid5_write(struct rqelement *rqe)
     if (debug & DEBUG_LASTREQS)
 	logrq(loginfo_raid5_parity, (union rqinfou) rqe, ubp);
 #endif
-    DEV_STRATEGY(&rqe->b, 0);
+    DEV_STRATEGY(&rqe->b);
 }
 
 /* Local Variables: */
diff --git a/sys/dev/vinum/vinumio.c b/sys/dev/vinum/vinumio.c
index 612f5ed8b4db..0aef397d5e98 100644
--- a/sys/dev/vinum/vinumio.c
+++ b/sys/dev/vinum/vinumio.c
@@ -281,7 +281,7 @@ driveio(struct drive *drive, char *buf, size_t length, off_t offset, int flag)
 	bp->b_saveaddr = bp->b_data;
 	bp->b_data = buf;
 	bp->b_bcount = len;
-	DEV_STRATEGY(bp, 0);				    /* initiate the transfer */
+	DEV_STRATEGY(bp);				    /* initiate the transfer */
 	error = bufwait(bp);
 	bp->b_data = bp->b_saveaddr;
 	bp->b_flags |= B_INVAL | B_AGE;
@@ -758,7 +758,7 @@ write_volume_label(int volno)
      *
      * Negotiate with phk to get it fixed.
      */
-    DEV_STRATEGY(bp, 0);
+    DEV_STRATEGY(bp);
     error = bufwait(bp);
     bp->b_flags |= B_INVAL | B_AGE;
     bp->b_ioflags &= ~BIO_ERROR;
diff --git a/sys/dev/vinum/vinumrequest.c b/sys/dev/vinum/vinumrequest.c
index 56086a4b3691..8423ed2c905c 100644
--- a/sys/dev/vinum/vinumrequest.c
+++ b/sys/dev/vinum/vinumrequest.c
@@ -439,7 +439,7 @@ launch_requests(struct request *rq, int reviveok)
 		    logrq(loginfo_rqe, (union rqinfou) rqe, rq->bp);
 #endif
 		/* fire off the request */
-		DEV_STRATEGY(&rqe->b, 0);
+		DEV_STRATEGY(&rqe->b);
 	    }
 	}
     }
@@ -983,7 +983,7 @@ sdio(struct buf *bp)
     if (debug & DEBUG_LASTREQS)
 	logrq(loginfo_sdiol, (union rqinfou) &sbp->b, &sbp->b);
 #endif
-    DEV_STRATEGY(&sbp->b, 0);
+    DEV_STRATEGY(&sbp->b);
     splx(s);
 }
 
diff --git a/sys/fs/specfs/spec_vnops.c b/sys/fs/specfs/spec_vnops.c
index 9a12ee4414a8..ec5cc4614018 100644
--- a/sys/fs/specfs/spec_vnops.c
+++ b/sys/fs/specfs/spec_vnops.c
@@ -602,10 +602,10 @@ spec_strategy(ap)
 	
 	if (dsw->d_flags & D_NOGIANT) {
 		DROP_GIANT();
-		DEV_STRATEGY(bp, 0);
+		DEV_STRATEGY(bp);
 		PICKUP_GIANT();
 	} else
-		DEV_STRATEGY(bp, 0);
+		DEV_STRATEGY(bp);
 		
 	return (0);
 }
@@ -635,7 +635,7 @@ spec_freeblks(ap)
 	bp->b_offset = dbtob(ap->a_addr);
 	bp->b_bcount = ap->a_length;
 	BUF_KERNPROC(bp);
-	DEV_STRATEGY(bp, 0);
+	DEV_STRATEGY(bp);
 	return (0);
 }
 
diff --git a/sys/kern/kern_physio.c b/sys/kern/kern_physio.c
index 3525ca0547fb..f61b55ce8856 100644
--- a/sys/kern/kern_physio.c
+++ b/sys/kern/kern_physio.c
@@ -104,7 +104,7 @@ physio(dev_t dev, struct uio *uio, int ioflag)
 				vmapbuf(bp);
 			}
 
-			DEV_STRATEGY(bp, 0);
+			DEV_STRATEGY(bp);
 			spl = splbio();
 			while ((bp->b_flags & B_DONE) == 0)
 				tsleep(bp, PRIBIO, "physstr", 0);
diff --git a/sys/kern/subr_disklabel.c b/sys/kern/subr_disklabel.c
index c41d9bec8992..2166fc29bdb3 100644
--- a/sys/kern/subr_disklabel.c
+++ b/sys/kern/subr_disklabel.c
@@ -72,7 +72,7 @@ readdisklabel(dev, lp)
 	bp->b_bcount = lp->d_secsize;
 	bp->b_flags &= ~B_INVAL;
 	bp->b_iocmd = BIO_READ;
-	DEV_STRATEGY(bp, 1);
+	DEV_STRATEGY(bp);
 	if (bufwait(bp))
 		msg = "I/O error";
 	else if (bp->b_resid != 0)
@@ -177,7 +177,7 @@ writedisklabel(dev, lp)
 	 */
 	bp->b_flags &= ~B_INVAL;
 	bp->b_iocmd = BIO_READ;
-	DEV_STRATEGY(bp, 1);
+	DEV_STRATEGY(bp);
 	error = bufwait(bp);
 	if (error)
 		goto done;
@@ -197,7 +197,7 @@ writedisklabel(dev, lp)
 #ifdef __alpha__
 			alpha_fix_srm_checksum(bp);
 #endif
-			DEV_STRATEGY(bp, 1);
+			DEV_STRATEGY(bp);
 			error = bufwait(bp);
 			goto done;
 		}
@@ -210,7 +210,7 @@ done:
 	*dlp = *lp;
 	bp->b_flags &= ~B_INVAL;
 	bp->b_iocmd = BIO_WRITE;
-	DEV_STRATEGY(bp, 1);
+	DEV_STRATEGY(bp);
 	error = bufwait(bp);
 #endif
 	bp->b_flags |= B_INVAL | B_AGE;
diff --git a/sys/kern/subr_diskmbr.c b/sys/kern/subr_diskmbr.c
index 596bb95e6e66..7561c801afc6 100644
--- a/sys/kern/subr_diskmbr.c
+++ b/sys/kern/subr_diskmbr.c
@@ -214,7 +214,7 @@ reread_mbr:
 	bp->b_blkno = mbr_offset;
 	bp->b_bcount = lp->d_secsize;
 	bp->b_iocmd = BIO_READ;
-	DEV_STRATEGY(bp, 1);
+	DEV_STRATEGY(bp);
 	if (bufwait(bp) != 0) {
 		disk_err(&bp->b_io, "reading primary partition table: error",
 		    0, 1);
@@ -416,7 +416,7 @@ mbr_extended(dev, lp, ssp, ext_offset, ext_size, base_ext_offset, nsectors,
 	bp->b_blkno = ext_offset;
 	bp->b_bcount = lp->d_secsize;
 	bp->b_iocmd = BIO_READ;
-	DEV_STRATEGY(bp, 1);
+	DEV_STRATEGY(bp);
 	if (bufwait(bp) != 0) {
 		disk_err(&bp->b_io, "reading extended partition table: error",
 		    0, 1);
diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c
index 45b25fc4d58a..2f63af984ee9 100644
--- a/sys/kern/vfs_aio.c
+++ b/sys/kern/vfs_aio.c
@@ -1139,7 +1139,7 @@ aio_qphysio(struct proc *p, struct aiocblist *aiocbe)
 	splx(s);
 	
 	/* Perform transfer. */
-	DEV_STRATEGY(bp, 0);
+	DEV_STRATEGY(bp);
 
 	notify = 0;
 	s = splbio();
diff --git a/sys/pc98/pc98/diskslice_machdep.c b/sys/pc98/pc98/diskslice_machdep.c
index 94f3db733159..3bec4c65b8af 100644
--- a/sys/pc98/pc98/diskslice_machdep.c
+++ b/sys/pc98/pc98/diskslice_machdep.c
@@ -197,7 +197,7 @@ dsinit(dev, lp, sspp)
 	bp->b_iocmd = BIO_READ;
 	if (bp->b_bcount < 1024)
 		bp->b_bcount = 1024;
-	DEV_STRATEGY(bp, 1);
+	DEV_STRATEGY(bp);
 	if (bufwait(bp) != 0) {
 		disk_err(&bp->b_io, "reading primary partition table: error",
 		    0, 1);
diff --git a/sys/sys/conf.h b/sys/sys/conf.h
index a36fea7e737c..ca14498e263b 100644
--- a/sys/sys/conf.h
+++ b/sys/sys/conf.h
@@ -173,7 +173,7 @@ typedef int l_modem_t(struct tty *tp, int flag);
 	(*devsw((bp)->bio_dev)->d_strategy)(bp);			\
 	} while (0)
 
-#define DEV_STRATEGY(bp, dummy)						\
+#define DEV_STRATEGY(bp)						\
 	do {								\
 	if ((bp)->b_flags & B_PHYS)					\
 		(bp)->b_io.bio_offset = (bp)->b_offset;			\
diff --git a/sys/sys/linedisc.h b/sys/sys/linedisc.h
index a36fea7e737c..ca14498e263b 100644
--- a/sys/sys/linedisc.h
+++ b/sys/sys/linedisc.h
@@ -173,7 +173,7 @@ typedef int l_modem_t(struct tty *tp, int flag);
 	(*devsw((bp)->bio_dev)->d_strategy)(bp);			\
 	} while (0)
 
-#define DEV_STRATEGY(bp, dummy)						\
+#define DEV_STRATEGY(bp)						\
 	do {								\
 	if ((bp)->b_flags & B_PHYS)					\
 		(bp)->b_io.bio_offset = (bp)->b_offset;			\