diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-06-20 18:15:48 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-06-20 18:15:48 +0000 |
| commit | 873db335f698dc92ad5bb1724185b94b78cadc90 (patch) | |
| tree | 5d88760d74825983a6db073cbf8f2208063bb6cc /sys/arch/alpha | |
| parent | fca02c516c82caf63d1f863db7e8b1b418f4cb66 (diff) | |
b_cylinder does not need to be set on the callpath down into drivers.
cpu_disklabel can go away, since nothing anymore needs to use it; ok miod
Diffstat (limited to 'sys/arch/alpha')
| -rw-r--r-- | sys/arch/alpha/alpha/disksubr.c | 11 | ||||
| -rw-r--r-- | sys/arch/alpha/include/disklabel.h | 5 |
2 files changed, 5 insertions, 11 deletions
diff --git a/sys/arch/alpha/alpha/disksubr.c b/sys/arch/alpha/alpha/disksubr.c index 0f0648ca81e..a3b146cd2db 100644 --- a/sys/arch/alpha/alpha/disksubr.c +++ b/sys/arch/alpha/alpha/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.88 2007/06/17 00:27:28 deraadt Exp $ */ +/* $OpenBSD: disksubr.c,v 1.89 2007/06/20 18:15:45 deraadt Exp $ */ /* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */ /* @@ -50,7 +50,7 @@ */ char * readdisklabel(dev_t dev, void (*strat)(struct buf *), - struct disklabel *lp, struct cpu_disklabel *osdep, int spoofonly) + struct disklabel *lp, int spoofonly) { struct buf *bp = NULL; char *msg; @@ -66,7 +66,6 @@ readdisklabel(dev_t dev, void (*strat)(struct buf *), goto doslabel; bp->b_blkno = LABELSECTOR; - bp->b_cylinder = 0; bp->b_bcount = lp->d_secsize; bp->b_flags = B_BUSY | B_READ; (*strat)(bp); @@ -80,7 +79,7 @@ readdisklabel(dev_t dev, void (*strat)(struct buf *), goto done; doslabel: - msg = readdoslabel(bp, strat, lp, osdep, NULL, NULL, spoofonly); + msg = readdoslabel(bp, strat, lp, NULL, spoofonly); if (msg == NULL) goto done; @@ -109,8 +108,7 @@ done: * Write disk label back to device after modification. */ int -writedisklabel(dev_t dev, void (*strat)(struct buf *), - struct disklabel *lp, struct cpu_disklabel *osdep) +writedisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp) { u_int64_t csum = 0, *p; struct disklabel *dlp; @@ -122,7 +120,6 @@ writedisklabel(dev_t dev, void (*strat)(struct buf *), bp->b_dev = dev; bp->b_blkno = LABELSECTOR; - bp->b_cylinder = 0; bp->b_bcount = lp->d_secsize; bp->b_flags = B_BUSY | B_READ; (*strat)(bp); diff --git a/sys/arch/alpha/include/disklabel.h b/sys/arch/alpha/include/disklabel.h index f81332f04e3..628956a84dc 100644 --- a/sys/arch/alpha/include/disklabel.h +++ b/sys/arch/alpha/include/disklabel.h @@ -1,4 +1,4 @@ -/* $OpenBSD: disklabel.h,v 1.22 2007/06/17 15:05:08 krw Exp $ */ +/* $OpenBSD: disklabel.h,v 1.23 2007/06/20 18:15:43 deraadt Exp $ */ /* * Copyright (c) 1994 Christopher G. Demetriou @@ -37,7 +37,4 @@ #define LABELOFFSET 64 #define MAXPARTITIONS 16 /* number of partitions */ -struct cpu_disklabel { -}; - #endif /* _MACHINE_DISKLABEL_H_ */ |