diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2007-02-18 14:18:29 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2007-02-18 14:18:29 +0000 |
| commit | 863120e384bc29d84beace1267002292ab85740e (patch) | |
| tree | eec89e842a1202ee90db754f4951432c25af55dd /sys/arch/mips64 | |
| parent | f81626bc7723b5e5969a08ef9557de09183ca9a3 (diff) | |
Remove #ifdef/#endif's around MBR checking code. Remove now unused
option DISKLABEL_I386.
ok deraadt@
Diffstat (limited to 'sys/arch/mips64')
| -rw-r--r-- | sys/arch/mips64/mips64/disksubr.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sys/arch/mips64/mips64/disksubr.c b/sys/arch/mips64/mips64/disksubr.c index 7b4518c1559..1edc6b9d6d8 100644 --- a/sys/arch/mips64/mips64/disksubr.c +++ b/sys/arch/mips64/mips64/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.35 2007/02/18 13:49:22 krw Exp $ */ +/* $OpenBSD: disksubr.c,v 1.36 2007/02/18 14:18:28 krw Exp $ */ /* * Copyright (c) 1999 Michael Shalayeff @@ -52,10 +52,8 @@ char *readbsdlabel(struct buf *, void (*)(struct buf *), int, int, int, struct disklabel *, int); -#if defined(DISKLABEL_I386) char *readdoslabel(struct buf *, void (*)(struct buf *), struct disklabel *, struct cpu_disklabel *, int *, int *, int); -#endif char *readsgilabel(struct buf *, void (*)(struct buf *), struct disklabel *, struct cpu_disklabel *, int *, int *, int); void map_sgi_label(struct disklabel *, struct sgilabel *); @@ -170,7 +168,6 @@ readdisklabel(dev, strat, lp, osdep, spoofonly) fallbacklabel = *lp; *lp = minilabel; } -#if defined(DISKLABEL_I386) if (msg) { msg = readdoslabel(bp, strat, lp, osdep, 0, 0, spoofonly); if (msg) { @@ -179,7 +176,6 @@ readdisklabel(dev, strat, lp, osdep, spoofonly) *lp = minilabel; } } -#endif /* Record metainformation about the disklabel. */ if (msg == NULL) { osdep->labelsector = bp->b_blkno; @@ -205,7 +201,6 @@ readdisklabel(dev, strat, lp, osdep, spoofonly) return (msg); } -#if defined(DISKLABEL_I386) /* * If dos partition table requested, attempt to load it and * find disklabel inside a DOS partition. Return buffer @@ -405,7 +400,6 @@ notfat: return (msg); } -#endif /* * @@ -605,13 +599,11 @@ writedisklabel(dev, strat, lp, osdep) dl = *lp; msg = readsgilabel(bp, strat, &dl, &cdl, &partoff, &cyl, 0); labeloffset = SGI_LABELOFFSET; -#if defined(DISKLABEL_I386) if (msg) { dl = *lp; msg = readdoslabel(bp, strat, &dl, &cdl, &partoff, &cyl, 0); labeloffset = I386_LABELOFFSET; } -#endif if (msg) { if (partoff == -1) return EIO; |