b_un.b_addr -> b_data; no functional change.

6 files changed, 21 insertions, 21 deletions

diff --git a/sys/arch/vax/mba/mba.c b/sys/arch/vax/mba/mba.c
index fa1a9f5a379..1a89f6ad2d1 100644
--- a/sys/arch/vax/mba/mba.c
+++ b/sys/arch/vax/mba/mba.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mba.c,v 1.9 2002/03/14 01:26:48 millert Exp $ */
+/*	$OpenBSD: mba.c,v 1.10 2006/01/20 23:27:25 miod Exp $ */
 /*	$NetBSD: mba.c,v 1.18 2000/01/24 02:40:36 matt Exp $ */
 /*
  * Copyright (c) 1994, 1996 Ludd, University of Lule}, Sweden.
@@ -290,7 +290,7 @@ mbastart(sc)
 	    0, PG_V);
 
 	sc->sc_state = SC_ACTIVE;
-	mr->mba_var = ((u_int)bp->b_un.b_addr & VAX_PGOFSET);
+	mr->mba_var = ((u_int)bp->b_data & VAX_PGOFSET);
 	mr->mba_bc = (~bp->b_bcount) + 1;
 	(*md->md_start)(md);		/* machine-dependent start */
 }
diff --git a/sys/arch/vax/uba/uba.c b/sys/arch/vax/uba/uba.c
index 4ce9b98cc04..74f369a6ab2 100644
--- a/sys/arch/vax/uba/uba.c
+++ b/sys/arch/vax/uba/uba.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uba.c,v 1.21 2004/12/25 23:02:25 miod Exp $	   */
+/*	$OpenBSD: uba.c,v 1.22 2006/01/20 23:27:26 miod Exp $	   */
 /*	$NetBSD: uba.c,v 1.43 2000/01/24 02:40:36 matt Exp $	   */
 /*
  * Copyright (c) 1996 Jonathan Stone.
@@ -580,7 +580,7 @@ ubasetup(uh, bp, flags)
 	if (uh->uh_nbdp == 0)
 		flags &= ~UBA_NEEDBDP;
 
-	o = (int)bp->b_un.b_addr & VAX_PGOFSET;
+	o = (int)bp->b_data & VAX_PGOFSET;
 	npf = vax_btoc(bp->b_bcount + o) + 1;
 	if (npf > UBA_MAXNMR)
 		panic("uba xfer too big");
@@ -644,7 +644,7 @@ uballoc(uh, addr, bcnt, flags)
 {
 	struct buf ubabuf;
 
-	ubabuf.b_un.b_addr = addr;
+	ubabuf.b_data = addr;
 	ubabuf.b_flags = B_BUSY;
 	ubabuf.b_bcount = bcnt;
 	/* that's all the fields ubasetup() needs */
diff --git a/sys/arch/vax/vax/cfl.c b/sys/arch/vax/vax/cfl.c
index ed3128bf91e..755dc404b60 100644
--- a/sys/arch/vax/vax/cfl.c
+++ b/sys/arch/vax/vax/cfl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cfl.c,v 1.5 2003/06/02 23:27:58 millert Exp $	*/
+/*	$OpenBSD: cfl.c,v 1.6 2006/01/20 23:27:26 miod Exp $	*/
 /*	$NetBSD: cfl.c,v 1.2 1998/04/13 12:10:26 ragge Exp $	*/
 /*-
  * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
@@ -148,7 +148,7 @@ cflrw(dev, uio, flag)
 			break;
 		}
 		if (uio->uio_rw == UIO_WRITE) {
-			error = uiomove(bp->b_un.b_addr, i, uio);
+			error = uiomove(bp->b_data, i, uio);
 			if (error)
 				break;
 		}
@@ -163,7 +163,7 @@ cflrw(dev, uio, flag)
 			break;
 		}
 		if (uio->uio_rw == UIO_READ) {
-			error = uiomove(bp->b_un.b_addr, i, uio);
+			error = uiomove(bp->b_data, i, uio);
 			if (error)
 				break;
 		}
@@ -180,7 +180,7 @@ cflstart()
 
 	bp = cfltab.cfl_buf;
 	cfltab.cfl_errcnt = 0;
-	cfltab.cfl_xaddr = (unsigned char *) bp->b_un.b_addr;
+	cfltab.cfl_xaddr = (unsigned char *) bp->b_data;
 	cfltab.cfl_active = CFL_START;
 	bp->b_resid = 0;
 
diff --git a/sys/arch/vax/vax/crl.c b/sys/arch/vax/vax/crl.c
index 0e703e183b8..d940f7fca65 100644
--- a/sys/arch/vax/vax/crl.c
+++ b/sys/arch/vax/vax/crl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: crl.c,v 1.7 2003/06/02 23:27:58 millert Exp $	*/
+/*	$OpenBSD: crl.c,v 1.8 2006/01/20 23:27:26 miod Exp $	*/
 /*	$NetBSD: crl.c,v 1.6 2000/01/24 02:40:33 matt Exp $	*/
 /*-
  * Copyright (c) 1982, 1986 The Regents of the University of California.
@@ -140,7 +140,7 @@ crlrw(dev, uio, flag)
 			break;
 		}
 		if (uio->uio_rw == UIO_WRITE) {
-			error = uiomove(bp->b_un.b_addr, i, uio);
+			error = uiomove(bp->b_data, i, uio);
 			if (error)
 				break;
 		}
@@ -155,7 +155,7 @@ crlrw(dev, uio, flag)
 			break;
 		}
 		if (uio->uio_rw == UIO_READ) {
-			error = uiomove(bp->b_un.b_addr, i, uio);
+			error = uiomove(bp->b_data, i, uio);
 			if (error)
 				break;
 		}
@@ -172,7 +172,7 @@ crlstart()
 
 	bp = crltab.crl_buf;
 	crltab.crl_errcnt = 0;
-	crltab.crl_xaddr = (ushort *) bp->b_un.b_addr;
+	crltab.crl_xaddr = (ushort *) bp->b_data;
 	bp->b_resid = 0;
 
 	if ((mfpr(PR_STXCS) & STXCS_RDY) == 0)
diff --git a/sys/arch/vax/vax/ctu.c b/sys/arch/vax/vax/ctu.c
index f6c5868402a..0e1cd8ee015 100644
--- a/sys/arch/vax/vax/ctu.c
+++ b/sys/arch/vax/vax/ctu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ctu.c,v 1.8 2005/11/24 04:53:59 brad Exp $ */
+/*	$OpenBSD: ctu.c,v 1.9 2006/01/20 23:27:26 miod Exp $ */
 /*	$NetBSD: ctu.c,v 1.10 2000/03/23 06:46:44 thorpej Exp $ */
 /*
  * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
@@ -176,7 +176,7 @@ ctustrategy(bp)
 
 #ifdef TUDEBUG
 	printf("addr %x, block %x, nblock %x, read %x\n",
-		bp->b_un.b_addr, bp->b_blkno, bp->b_bcount,
+		bp->b_data, bp->b_blkno, bp->b_bcount,
 		bp->b_flags & B_READ);
 #endif
 
@@ -201,7 +201,7 @@ ctustart(bp)
 	struct rsp *rsp = (struct rsp *)tu_sc.sc_rsp;
 
 
-	tu_sc.sc_xfptr = tu_sc.sc_blk = bp->b_un.b_addr;
+	tu_sc.sc_xfptr = tu_sc.sc_blk = bp->b_data;
 	tu_sc.sc_tpblk = bp->b_blkno;
 	tu_sc.sc_nbytes = bp->b_bcount;
 	tu_sc.sc_xbytes = tu_sc.sc_bbytes = 0;
diff --git a/sys/arch/vax/vax/disksubr.c b/sys/arch/vax/vax/disksubr.c
index 6edaba6eb2c..4409b04072c 100644
--- a/sys/arch/vax/vax/disksubr.c
+++ b/sys/arch/vax/vax/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.25 2005/12/22 02:51:25 krw Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.26 2006/01/20 23:27:26 miod Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.21 1999/06/30 18:48:06 ragge Exp $	*/
 
 /*
@@ -157,7 +157,7 @@ readdisklabel(dev, strat, lp, osdep, spoofonly)
 	if (biowait(bp)) {
 		msg = "I/O error";
 	} else {
-		dlp = (struct disklabel *)(bp->b_un.b_addr + LABELOFFSET);
+		dlp = (struct disklabel *)(bp->b_data + LABELOFFSET);
 		if (dlp->d_magic != DISKMAGIC || dlp->d_magic2 != DISKMAGIC) {
 			msg = "no disk label";
 		} else if (dlp->d_npartitions > MAXPARTITIONS ||
@@ -260,7 +260,7 @@ writedisklabel(dev, strat, lp, osdep)
 
 	bp = geteblk((int)lp->d_secsize);
 
-	dlp = (struct disklabel *)(bp->b_un.b_addr + LABELOFFSET);
+	dlp = (struct disklabel *)(bp->b_data + LABELOFFSET);
 	bcopy(lp, dlp, sizeof(struct disklabel));
 
 	bp->b_dev = MAKEDISKDEV(major(dev), DISKUNIT(dev), RAW_PART);
@@ -308,9 +308,9 @@ disk_reallymapin(bp, map, reg, flag)
 	int pfnum, npf, o, i;
 	caddr_t addr;
 
-	o = (int)bp->b_un.b_addr & VAX_PGOFSET;
+	o = (int)bp->b_data & VAX_PGOFSET;
 	npf = vax_btoc(bp->b_bcount + o) + 1;
-	addr = bp->b_un.b_addr;
+	addr = bp->b_data;
 	p = bp->b_proc;
 
 	/*