summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/alpha/alpha/disksubr.c12
-rw-r--r--sys/arch/alpha/conf/GENERIC5
-rw-r--r--sys/arch/hppa/hppa/disksubr.c10
-rw-r--r--sys/arch/hppa64/hppa64/disksubr.c10
-rw-r--r--sys/arch/mips64/mips64/disksubr.c10
5 files changed, 5 insertions, 42 deletions
diff --git a/sys/arch/alpha/alpha/disksubr.c b/sys/arch/alpha/alpha/disksubr.c
index 1dc11fc99ab..387f8156a67 100644
--- a/sys/arch/alpha/alpha/disksubr.c
+++ b/sys/arch/alpha/alpha/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.66 2007/02/18 13:49:22 krw Exp $ */
+/* $OpenBSD: disksubr.c,v 1.67 2007/02/18 14:18:28 krw Exp $ */
/* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */
/*
@@ -50,10 +50,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
/*
* Try to read a standard BSD disklabel at a certain sector.
@@ -163,7 +161,6 @@ readdisklabel(dev, strat, lp, osdep, spoofonly)
lp, spoofonly);
if (msg)
*lp = minilabel;
-#if defined(DISKLABEL_I386)
if (msg) {
msg = readdoslabel(bp, strat, lp, osdep, 0, 0, spoofonly);
if (msg) {
@@ -172,7 +169,6 @@ readdisklabel(dev, strat, lp, osdep, spoofonly)
*lp = minilabel;
}
}
-#endif
/* Record metainformation about the disklabel. */
if (msg == NULL) {
osdep->labelsector = bp->b_blkno;
@@ -198,7 +194,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
@@ -398,7 +393,6 @@ notfat:
return (msg);
}
-#endif
/*
* Check new disk label for sensibility
@@ -478,9 +472,7 @@ writedisklabel(dev, strat, lp, osdep)
char *msg = "no disk label";
struct buf *bp;
struct disklabel dl;
-#if defined(DISKLABEL_I386)
struct cpu_disklabel cdl;
-#endif
int labeloffset, error, i, partoff = 0, cyl = 0, needcsum = 0;
u_int64_t csum, *p;
@@ -500,13 +492,11 @@ writedisklabel(dev, strat, lp, osdep)
labeloffset = ALPHA_LABELOFFSET;
if (msg == NULL)
needcsum = 1;
-#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;
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index 8c37cf09203..d04c26c1de1 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.187 2006/11/25 20:44:30 dlg Exp $
+# $OpenBSD: GENERIC,v 1.188 2007/02/18 14:18:28 krw Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -31,9 +31,6 @@ option API_UP1000 # EV6: Alpha Processor UP1000
option COMPAT_OSF1 # OSF/1 binary compatibility
option COMPAT_NETBSD # NetBSD compatibility
-# Disklabel compatibility options
-option DISKLABEL_I386 # i386/arc style of partitioning
-
# Misc. options
option EISAVERBOSE # recognize "unknown" EISA devices
option PCIVERBOSE # recognize "unknown" PCI devices
diff --git a/sys/arch/hppa/hppa/disksubr.c b/sys/arch/hppa/hppa/disksubr.c
index 7ff7b78069e..e1ab72b0e2b 100644
--- a/sys/arch/hppa/hppa/disksubr.c
+++ b/sys/arch/hppa/hppa/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.46 2007/02/18 13:49:22 krw Exp $ */
+/* $OpenBSD: disksubr.c,v 1.47 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 *readliflabel(struct buf *, void (*)(struct buf *),
struct disklabel *, struct cpu_disklabel *, int *, int *, int);
@@ -166,7 +164,6 @@ readdisklabel(dev, strat, lp, osdep, spoofonly)
msg = readliflabel(bp, strat, lp, osdep, 0, 0, spoofonly);
if (msg)
*lp = minilabel;
-#if defined(DISKLABEL_I386)
if (msg) {
msg = readdoslabel(bp, strat, lp, osdep, 0, 0, spoofonly);
if (msg) {
@@ -175,7 +172,6 @@ readdisklabel(dev, strat, lp, osdep, spoofonly)
*lp = minilabel;
}
}
-#endif
/* Record metainformation about the disklabel. */
if (msg == NULL) {
osdep->labelsector = bp->b_blkno;
@@ -201,7 +197,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
@@ -401,7 +396,6 @@ notfat:
return (msg);
}
-#endif
char *
readliflabel (bp, strat, lp, osdep, partoffp, cylp, spoofonly)
@@ -659,13 +653,11 @@ writedisklabel(dev, strat, lp, osdep)
dl = *lp;
msg = readliflabel(bp, strat, &dl, &cdl, &partoff, &cyl, 0);
labeloffset = HPPA_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;
diff --git a/sys/arch/hppa64/hppa64/disksubr.c b/sys/arch/hppa64/hppa64/disksubr.c
index f60223e1099..bc875ebd609 100644
--- a/sys/arch/hppa64/hppa64/disksubr.c
+++ b/sys/arch/hppa64/hppa64/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.29 2007/02/18 13:49:22 krw Exp $ */
+/* $OpenBSD: disksubr.c,v 1.30 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 *readliflabel(struct buf *, void (*)(struct buf *),
struct disklabel *, struct cpu_disklabel *, int *, int *, int);
@@ -166,7 +164,6 @@ readdisklabel(dev, strat, lp, osdep, spoofonly)
msg = readliflabel(bp, strat, lp, osdep, 0, 0, spoofonly);
if (msg)
*lp = minilabel;
-#if defined(DISKLABEL_I386)
if (msg) {
msg = readdoslabel(bp, strat, lp, osdep, 0, 0, spoofonly);
if (msg) {
@@ -175,7 +172,6 @@ readdisklabel(dev, strat, lp, osdep, spoofonly)
*lp = minilabel;
}
}
-#endif
/* Record metainformation about the disklabel. */
if (msg == NULL) {
osdep->labelsector = bp->b_blkno;
@@ -197,7 +193,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
@@ -397,7 +392,6 @@ notfat:
return (msg);
}
-#endif
char *
readliflabel (bp, strat, lp, osdep, partoffp, cylp, spoofonly)
@@ -655,13 +649,11 @@ writedisklabel(dev, strat, lp, osdep)
dl = *lp;
msg = readliflabel(bp, strat, &dl, &cdl, &partoff, &cyl, 0);
labeloffset = HPPA_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;
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;
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-12 21:23:35 +0000