Module Name: src
Committed By: christos
Date: Thu May 16 19:06:45 UTC 2013
Modified Files:
src/sys/arch/arc/arc: disksubr.c
src/sys/arch/arc/include: disklabel.h
src/sys/arch/bebox/include: disklabel.h
src/sys/arch/cobalt/cobalt: disksubr.c
src/sys/arch/cobalt/include: disklabel.h
src/sys/arch/emips/include: disklabel.h disklabel.h disklabel.h
src/sys/arch/evbppc/include: disklabel.h
src/sys/arch/hpcmips/include: disklabel.h
src/sys/arch/i386/stand/lib: bootinfo_biosgeom.c
src/sys/arch/ibmnws/include: disklabel.h
src/sys/arch/landisk/include: disklabel.h
src/sys/arch/mvmeppc/include: disklabel.h
src/sys/arch/prep/include: disklabel.h
src/sys/arch/rs6000/include: disklabel.h
src/sys/arch/sandpoint/include: disklabel.h
src/sys/arch/sbmips/include: disklabel.h disklabel.h
src/sys/arch/sbmips/sbmips: disksubr.c
src/sys/arch/sh3/sh3: disksubr.c
src/sys/arch/x86/include: bootinfo.h bootinfo.h bootinfo.h
src/sys/arch/x86/x86: x86_autoconf.c
Log Message:
Complete the dosparts -> mbrparts conversion. Only x86k new uses dosparts
because it also uses struct dos_partition.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/arc/arc/disksubr.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arc/include/disklabel.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/bebox/include/disklabel.h
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/cobalt/cobalt/disksubr.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/cobalt/include/disklabel.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/emips/include/disklabel.h
cvs rdiff -u -r1.2 -r1.4 src/sys/arch/emips/include/disklabel.h
cvs rdiff -u -r1.2 -r1.5 src/sys/arch/emips/include/disklabel.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbppc/include/disklabel.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hpcmips/include/disklabel.h
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/i386/stand/lib/bootinfo_biosgeom.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ibmnws/include/disklabel.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/landisk/include/disklabel.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/mvmeppc/include/disklabel.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/prep/include/disklabel.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/rs6000/include/disklabel.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sandpoint/include/disklabel.h
cvs rdiff -u -r1.8 -r1.10 src/sys/arch/sbmips/include/disklabel.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sbmips/include/disklabel.h
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/sbmips/sbmips/disksubr.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/sh3/sh3/disksubr.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/x86/include/bootinfo.h
cvs rdiff -u -r1.19 -r1.21 src/sys/arch/x86/include/bootinfo.h
cvs rdiff -u -r1.19 -r1.22 src/sys/arch/x86/include/bootinfo.h
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/x86/x86/x86_autoconf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arc/arc/disksubr.c
diff -u src/sys/arch/arc/arc/disksubr.c:1.28 src/sys/arch/arc/arc/disksubr.c:1.29
--- src/sys/arch/arc/arc/disksubr.c:1.28 Wed Jan 2 06:48:22 2008
+++ src/sys/arch/arc/arc/disksubr.c Thu May 16 15:06:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.28 2008/01/02 11:48:22 ad Exp $ */
+/* $NetBSD: disksubr.c,v 1.29 2013/05/16 19:06:44 christos Exp $ */
/* $OpenBSD: disksubr.c,v 1.14 1997/05/08 00:14:29 deraadt Exp $ */
/* NetBSD: disksubr.c,v 1.40 1999/05/06 15:45:51 christos Exp */
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.28 2008/01/02 11:48:22 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.29 2013/05/16 19:06:44 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -188,7 +188,7 @@ readdisklabel(dev_t dev, void (*strat)(s
cyl = LABELSECTOR / lp->d_secpercyl;
if (!osdep)
goto nombrpart;
- dp = osdep->dosparts;
+ dp = osdep->mbrparts;
/* XXX - OpenBSD supports disklabel in EXT partition, but we don't */
/* read master boot record */
@@ -431,7 +431,7 @@ writedisklabel(dev_t dev, void (*strat)(
cyl = LABELSECTOR / lp->d_secpercyl;
if (!osdep)
goto nombrpart;
- dp = osdep->dosparts;
+ dp = osdep->mbrparts;
/* read master boot record */
bp->b_blkno = MBR_BBSECTOR;
Index: src/sys/arch/arc/include/disklabel.h
diff -u src/sys/arch/arc/include/disklabel.h:1.11 src/sys/arch/arc/include/disklabel.h:1.12
--- src/sys/arch/arc/include/disklabel.h:1.11 Tue Aug 30 08:39:53 2011
+++ src/sys/arch/arc/include/disklabel.h Thu May 16 15:06:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.11 2011/08/30 12:39:53 bouyer Exp $ */
+/* $NetBSD: disklabel.h,v 1.12 2013/05/16 19:06:44 christos Exp $ */
/* $OpenBSD: disklabel.h,v 1.14 1999/03/23 16:36:17 millert Exp $ */
/* NetBSD: disklabel.h,v 1.3 1996/03/09 20:52:54 ghudson Exp */
@@ -56,7 +56,7 @@
#include <sys/dkbad.h>
#endif /* HAVE_NBTOOL_CONFIG_H */
struct cpu_disklabel {
- struct mbr_partition dosparts[MBR_PART_COUNT];
+ struct mbr_partition mbrparts[MBR_PART_COUNT];
#define __HAVE_DISKLABEL_DKBAD
struct dkbad bad;
};
Index: src/sys/arch/bebox/include/disklabel.h
diff -u src/sys/arch/bebox/include/disklabel.h:1.10 src/sys/arch/bebox/include/disklabel.h:1.11
--- src/sys/arch/bebox/include/disklabel.h:1.10 Tue Aug 30 08:39:53 2011
+++ src/sys/arch/bebox/include/disklabel.h Thu May 16 15:06:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.10 2011/08/30 12:39:53 bouyer Exp $ */
+/* $NetBSD: disklabel.h,v 1.11 2013/05/16 19:06:44 christos Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
@@ -52,7 +52,7 @@
#include <sys/dkbad.h>
#endif /* HAVE_NBTOOL_CONFIG_H */
struct cpu_disklabel {
- struct mbr_partition dosparts[MBR_PART_COUNT];
+ struct mbr_partition mbrparts[MBR_PART_COUNT];
#define __HAVE_DISKLABEL_DKBAD
struct dkbad bad;
};
Index: src/sys/arch/cobalt/cobalt/disksubr.c
diff -u src/sys/arch/cobalt/cobalt/disksubr.c:1.24 src/sys/arch/cobalt/cobalt/disksubr.c:1.25
--- src/sys/arch/cobalt/cobalt/disksubr.c:1.24 Mon Mar 3 10:22:01 2008
+++ src/sys/arch/cobalt/cobalt/disksubr.c Thu May 16 15:06:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.24 2008/03/03 15:22:01 tsutsui Exp $ */
+/* $NetBSD: disksubr.c,v 1.25 2013/05/16 19:06:44 christos Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.24 2008/03/03 15:22:01 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.25 2013/05/16 19:06:44 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -137,7 +137,7 @@ readdisklabel(dev_t dev, void (*strat)(s
cyl = LABELSECTOR / lp->d_secpercyl;
if (!osdep)
goto nombrpart;
- dp = osdep->dosparts;
+ dp = osdep->mbrparts;
/* read master boot record */
bp->b_blkno = MBR_BBSECTOR;
@@ -333,7 +333,7 @@ writedisklabel(dev_t dev, void (*strat)(
cyl = LABELSECTOR / lp->d_secpercyl;
if (!osdep)
goto nombrpart;
- dp = osdep->dosparts;
+ dp = osdep->mbrparts;
/* read master boot record */
bp->b_blkno = MBR_BBSECTOR;
Index: src/sys/arch/cobalt/include/disklabel.h
diff -u src/sys/arch/cobalt/include/disklabel.h:1.11 src/sys/arch/cobalt/include/disklabel.h:1.12
--- src/sys/arch/cobalt/include/disklabel.h:1.11 Tue Aug 30 08:39:54 2011
+++ src/sys/arch/cobalt/include/disklabel.h Thu May 16 15:06:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.11 2011/08/30 12:39:54 bouyer Exp $ */
+/* $NetBSD: disklabel.h,v 1.12 2013/05/16 19:06:44 christos Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
@@ -53,7 +53,7 @@
#include <sys/dkbad.h>
#endif /* HAVE_NBTOOL_CONFIG_H */
struct cpu_disklabel {
- struct mbr_partition dosparts[MBR_PART_COUNT];
+ struct mbr_partition mbrparts[MBR_PART_COUNT];
#define __HAVE_DISKLABEL_DKBAD
struct dkbad bad;
};
Index: src/sys/arch/emips/include/disklabel.h
diff -u src/sys/arch/emips/include/disklabel.h:1.2 src/sys/arch/emips/include/disklabel.h:1.3
--- src/sys/arch/emips/include/disklabel.h:1.2 Tue Aug 30 08:39:54 2011
+++ src/sys/arch/emips/include/disklabel.h Thu May 16 15:06:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.2 2011/08/30 12:39:54 bouyer Exp $ */
+/* $NetBSD: disklabel.h,v 1.3 2013/05/16 19:06:44 christos Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
@@ -50,7 +50,7 @@
#endif /* HAVE_NBTOOL_CONFIG_H */
struct cpu_disklabel {
- struct mbr_partition dosparts[MBR_PART_COUNT];
+ struct mbr_partition mbrparts[MBR_PART_COUNT];
#define __HAVE_DISKLABEL_DKBAD
struct dkbad bad;
};
Index: src/sys/arch/emips/include/disklabel.h
diff -u src/sys/arch/emips/include/disklabel.h:1.2 src/sys/arch/emips/include/disklabel.h:1.4
--- src/sys/arch/emips/include/disklabel.h:1.2 Tue Aug 30 08:39:54 2011
+++ src/sys/arch/emips/include/disklabel.h Thu May 16 15:06:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.2 2011/08/30 12:39:54 bouyer Exp $ */
+/* $NetBSD: disklabel.h,v 1.4 2013/05/16 19:06:44 christos Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
@@ -50,7 +50,7 @@
#endif /* HAVE_NBTOOL_CONFIG_H */
struct cpu_disklabel {
- struct mbr_partition dosparts[MBR_PART_COUNT];
+ struct mbr_partition mbrparts[MBR_PART_COUNT];
#define __HAVE_DISKLABEL_DKBAD
struct dkbad bad;
};
Index: src/sys/arch/emips/include/disklabel.h
diff -u src/sys/arch/emips/include/disklabel.h:1.2 src/sys/arch/emips/include/disklabel.h:1.5
--- src/sys/arch/emips/include/disklabel.h:1.2 Tue Aug 30 08:39:54 2011
+++ src/sys/arch/emips/include/disklabel.h Thu May 16 15:06:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.2 2011/08/30 12:39:54 bouyer Exp $ */
+/* $NetBSD: disklabel.h,v 1.5 2013/05/16 19:06:44 christos Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
@@ -50,7 +50,7 @@
#endif /* HAVE_NBTOOL_CONFIG_H */
struct cpu_disklabel {
- struct mbr_partition dosparts[MBR_PART_COUNT];
+ struct mbr_partition mbrparts[MBR_PART_COUNT];
#define __HAVE_DISKLABEL_DKBAD
struct dkbad bad;
};
Index: src/sys/arch/evbppc/include/disklabel.h
diff -u src/sys/arch/evbppc/include/disklabel.h:1.7 src/sys/arch/evbppc/include/disklabel.h:1.8
--- src/sys/arch/evbppc/include/disklabel.h:1.7 Tue Aug 30 08:39:54 2011
+++ src/sys/arch/evbppc/include/disklabel.h Thu May 16 15:06:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.7 2011/08/30 12:39:54 bouyer Exp $ */
+/* $NetBSD: disklabel.h,v 1.8 2013/05/16 19:06:44 christos Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
@@ -60,7 +60,7 @@
struct cpu_disklabel {
#ifdef EVBPPC_HAS_MBR
- struct mbr_partition dosparts[MBR_PART_COUNT];
+ struct mbr_partition mbrparts[MBR_PART_COUNT];
#endif
#define __HAVE_DISKLABEL_DKBAD
struct dkbad bad; /* bad-sector information */
Index: src/sys/arch/hpcmips/include/disklabel.h
diff -u src/sys/arch/hpcmips/include/disklabel.h:1.10 src/sys/arch/hpcmips/include/disklabel.h:1.11
--- src/sys/arch/hpcmips/include/disklabel.h:1.10 Tue Aug 30 08:39:55 2011
+++ src/sys/arch/hpcmips/include/disklabel.h Thu May 16 15:06:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.10 2011/08/30 12:39:55 bouyer Exp $ */
+/* $NetBSD: disklabel.h,v 1.11 2013/05/16 19:06:44 christos Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
@@ -67,7 +67,7 @@
#include <sys/dkbad.h>
#endif /* HAVE_NBTOOL_CONFIG_H */
struct cpu_disklabel {
- struct mbr_partition dosparts[MBR_PART_COUNT];
+ struct mbr_partition mbrparts[MBR_PART_COUNT];
#define __HAVE_DISKLABEL_DKBAD
struct dkbad bad;
};
Index: src/sys/arch/i386/stand/lib/bootinfo_biosgeom.c
diff -u src/sys/arch/i386/stand/lib/bootinfo_biosgeom.c:1.21 src/sys/arch/i386/stand/lib/bootinfo_biosgeom.c:1.22
--- src/sys/arch/i386/stand/lib/bootinfo_biosgeom.c:1.21 Fri Dec 24 20:19:33 2010
+++ src/sys/arch/i386/stand/lib/bootinfo_biosgeom.c Thu May 16 15:06:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: bootinfo_biosgeom.c,v 1.21 2010/12/25 01:19:33 jakllsch Exp $ */
+/* $NetBSD: bootinfo_biosgeom.c,v 1.22 2013/05/16 19:06:44 christos Exp $ */
/*
* Copyright (c) 1997
@@ -169,8 +169,8 @@ bi_getbiosgeom(void)
for (j = 0, cksum = 0; j < BIOSDISK_DEFAULT_SECSIZE; j++)
cksum += buf[j];
bibg->disk[nvalid].cksum = cksum;
- memcpy(bibg->disk[nvalid].dosparts, &buf[MBR_PART_OFFSET],
- sizeof(bibg->disk[nvalid].dosparts));
+ memcpy(bibg->disk[nvalid].mbrparts, &buf[MBR_PART_OFFSET],
+ sizeof(bibg->disk[nvalid].mbrparts));
nvalid++;
}
Index: src/sys/arch/ibmnws/include/disklabel.h
diff -u src/sys/arch/ibmnws/include/disklabel.h:1.5 src/sys/arch/ibmnws/include/disklabel.h:1.6
--- src/sys/arch/ibmnws/include/disklabel.h:1.5 Tue Aug 30 08:39:55 2011
+++ src/sys/arch/ibmnws/include/disklabel.h Thu May 16 15:06:45 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.5 2011/08/30 12:39:55 bouyer Exp $ */
+/* $NetBSD: disklabel.h,v 1.6 2013/05/16 19:06:45 christos Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
@@ -49,7 +49,7 @@
#endif /* HAVE_NBTOOL_CONFIG_H */
struct cpu_disklabel {
- struct mbr_partition dosparts[MBR_PART_COUNT];
+ struct mbr_partition mbrparts[MBR_PART_COUNT];
#define __HAVE_DISKLABEL_DKBAD
struct dkbad bad;
};
Index: src/sys/arch/landisk/include/disklabel.h
diff -u src/sys/arch/landisk/include/disklabel.h:1.3 src/sys/arch/landisk/include/disklabel.h:1.4
--- src/sys/arch/landisk/include/disklabel.h:1.3 Tue Aug 30 08:39:56 2011
+++ src/sys/arch/landisk/include/disklabel.h Thu May 16 15:06:45 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.3 2011/08/30 12:39:56 bouyer Exp $ */
+/* $NetBSD: disklabel.h,v 1.4 2013/05/16 19:06:45 christos Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
@@ -54,7 +54,7 @@
#endif /* HAVE_NBTOOL_CONFIG_H */
struct cpu_disklabel {
- struct mbr_partition dosparts[MBR_PART_COUNT];
+ struct mbr_partition mbrparts[MBR_PART_COUNT];
#define __HAVE_DISKLABEL_DKBAD
struct dkbad bad;
};
Index: src/sys/arch/mvmeppc/include/disklabel.h
diff -u src/sys/arch/mvmeppc/include/disklabel.h:1.8 src/sys/arch/mvmeppc/include/disklabel.h:1.9
--- src/sys/arch/mvmeppc/include/disklabel.h:1.8 Tue Aug 30 08:39:57 2011
+++ src/sys/arch/mvmeppc/include/disklabel.h Thu May 16 15:06:45 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.8 2011/08/30 12:39:57 bouyer Exp $ */
+/* $NetBSD: disklabel.h,v 1.9 2013/05/16 19:06:45 christos Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
@@ -49,7 +49,7 @@
#endif /* HAVE_NBTOOL_CONFIG_H */
struct cpu_disklabel {
- struct mbr_partition dosparts[MBR_PART_COUNT];
+ struct mbr_partition mbrparts[MBR_PART_COUNT];
#define __HAVE_DISKLABEL_DKBAD
struct dkbad bad;
};
Index: src/sys/arch/prep/include/disklabel.h
diff -u src/sys/arch/prep/include/disklabel.h:1.9 src/sys/arch/prep/include/disklabel.h:1.10
--- src/sys/arch/prep/include/disklabel.h:1.9 Tue Aug 30 08:39:57 2011
+++ src/sys/arch/prep/include/disklabel.h Thu May 16 15:06:45 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.9 2011/08/30 12:39:57 bouyer Exp $ */
+/* $NetBSD: disklabel.h,v 1.10 2013/05/16 19:06:45 christos Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
@@ -47,7 +47,7 @@
#include <sys/dkbad.h>
#endif /* HAVE_NBTOOL_CONFIG_H */
struct cpu_disklabel {
- struct mbr_partition dosparts[MBR_PART_COUNT];
+ struct mbr_partition mbrparts[MBR_PART_COUNT];
#define __HAVE_DISKLABEL_DKBAD
struct dkbad bad;
};
Index: src/sys/arch/rs6000/include/disklabel.h
diff -u src/sys/arch/rs6000/include/disklabel.h:1.3 src/sys/arch/rs6000/include/disklabel.h:1.4
--- src/sys/arch/rs6000/include/disklabel.h:1.3 Tue Aug 30 08:39:58 2011
+++ src/sys/arch/rs6000/include/disklabel.h Thu May 16 15:06:45 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.3 2011/08/30 12:39:58 bouyer Exp $ */
+/* $NetBSD: disklabel.h,v 1.4 2013/05/16 19:06:45 christos Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
@@ -47,7 +47,7 @@
#include <sys/dkbad.h>
#endif /* HAVE_NBTOOL_CONFIG_H */
struct cpu_disklabel {
- struct mbr_partition dosparts[MBR_PART_COUNT];
+ struct mbr_partition mbrparts[MBR_PART_COUNT];
#define __HAVE_DISKLABEL_DKBAD
struct dkbad bad;
};
Index: src/sys/arch/sandpoint/include/disklabel.h
diff -u src/sys/arch/sandpoint/include/disklabel.h:1.8 src/sys/arch/sandpoint/include/disklabel.h:1.9
--- src/sys/arch/sandpoint/include/disklabel.h:1.8 Tue Aug 30 08:39:58 2011
+++ src/sys/arch/sandpoint/include/disklabel.h Thu May 16 15:06:45 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.8 2011/08/30 12:39:58 bouyer Exp $ */
+/* $NetBSD: disklabel.h,v 1.9 2013/05/16 19:06:45 christos Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
@@ -47,7 +47,7 @@
#include <sys/dkbad.h>
#endif /* HAVE_NBTOOL_CONFIG_H */
struct cpu_disklabel {
- struct mbr_partition dosparts[MBR_PART_COUNT];
+ struct mbr_partition mbrparts[MBR_PART_COUNT];
#define __HAVE_DISKLABEL_DKBAD
struct dkbad bad;
};
Index: src/sys/arch/sbmips/include/disklabel.h
diff -u src/sys/arch/sbmips/include/disklabel.h:1.8 src/sys/arch/sbmips/include/disklabel.h:1.10
--- src/sys/arch/sbmips/include/disklabel.h:1.8 Tue Aug 30 08:39:58 2011
+++ src/sys/arch/sbmips/include/disklabel.h Thu May 16 15:06:45 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.8 2011/08/30 12:39:58 bouyer Exp $ */
+/* $NetBSD: disklabel.h,v 1.10 2013/05/16 19:06:45 christos Exp $ */
/*
* Copyright 2000, 2001
@@ -88,7 +88,7 @@
#include <sys/dkbad.h>
#endif /* HAVE_NBTOOL_CONFIG_H */
struct cpu_disklabel {
- struct mbr_partition dosparts[MBR_PART_COUNT];
+ struct mbr_partition mbrparts[MBR_PART_COUNT];
#define __HAVE_DISKLABEL_DKBAD
struct dkbad bad;
};
Index: src/sys/arch/sbmips/include/disklabel.h
diff -u src/sys/arch/sbmips/include/disklabel.h:1.8 src/sys/arch/sbmips/include/disklabel.h:1.9
--- src/sys/arch/sbmips/include/disklabel.h:1.8 Tue Aug 30 08:39:58 2011
+++ src/sys/arch/sbmips/include/disklabel.h Thu May 16 15:06:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.8 2011/08/30 12:39:58 bouyer Exp $ */
+/* $NetBSD: disklabel.h,v 1.9 2013/05/16 19:06:44 christos Exp $ */
/*
* Copyright 2000, 2001
@@ -88,7 +88,7 @@
#include <sys/dkbad.h>
#endif /* HAVE_NBTOOL_CONFIG_H */
struct cpu_disklabel {
- struct mbr_partition dosparts[MBR_PART_COUNT];
+ struct mbr_partition mbrparts[MBR_PART_COUNT];
#define __HAVE_DISKLABEL_DKBAD
struct dkbad bad;
};
Index: src/sys/arch/sbmips/sbmips/disksubr.c
diff -u src/sys/arch/sbmips/sbmips/disksubr.c:1.20 src/sys/arch/sbmips/sbmips/disksubr.c:1.21
--- src/sys/arch/sbmips/sbmips/disksubr.c:1.20 Mon Mar 16 19:11:15 2009
+++ src/sys/arch/sbmips/sbmips/disksubr.c Thu May 16 15:06:45 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.20 2009/03/16 23:11:15 dsl Exp $ */
+/* $NetBSD: disksubr.c,v 1.21 2013/05/16 19:06:45 christos Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.20 2009/03/16 23:11:15 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.21 2013/05/16 19:06:45 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -135,7 +135,7 @@ readdisklabel(dev_t dev, void (*strat)(s
cyl = LABELSECTOR / lp->d_secpercyl;
if (!osdep)
goto nombrpart;
- dp = osdep->dosparts;
+ dp = osdep->mbrparts;
/* read master boot record */
bp->b_blkno = MBR_BBSECTOR;
@@ -334,7 +334,7 @@ writedisklabel(dev_t dev, void (*strat)(
cyl = LABELSECTOR / lp->d_secpercyl;
if (!osdep)
goto nombrpart;
- dp = osdep->dosparts;
+ dp = osdep->mbrparts;
/* read master boot record */
bp->b_blkno = MBR_BBSECTOR;
Index: src/sys/arch/sh3/sh3/disksubr.c
diff -u src/sys/arch/sh3/sh3/disksubr.c:1.28 src/sys/arch/sh3/sh3/disksubr.c:1.29
--- src/sys/arch/sh3/sh3/disksubr.c:1.28 Sat Feb 19 05:46:29 2011
+++ src/sys/arch/sh3/sh3/disksubr.c Thu May 16 15:06:45 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.28 2011/02/19 10:46:29 kiyohara Exp $ */
+/* $NetBSD: disksubr.c,v 1.29 2013/05/16 19:06:45 christos Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.28 2011/02/19 10:46:29 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.29 2013/05/16 19:06:45 christos Exp $");
#include "opt_mbr.h"
@@ -345,7 +345,7 @@ readdisklabel(dev_t dev, void (*strat)(s
cyl = LABELSECTOR / lp->d_secpercyl;
if (!osdep)
goto nombrpart;
- dp = osdep->dosparts;
+ dp = osdep->mbrparts;
/* read master boot record */
bp->b_blkno = MBR_BBSECTOR;
@@ -604,7 +604,7 @@ writedisklabel(dev_t dev, void (*strat)(
cyl = LABELSECTOR / lp->d_secpercyl;
if (!osdep)
goto nombrpart;
- dp = osdep->dosparts;
+ dp = osdep->mbrparts;
/* read master boot record */
bp->b_blkno = MBR_BBSECTOR;
Index: src/sys/arch/x86/include/bootinfo.h
diff -u src/sys/arch/x86/include/bootinfo.h:1.19 src/sys/arch/x86/include/bootinfo.h:1.20
--- src/sys/arch/x86/include/bootinfo.h:1.19 Mon Nov 28 02:56:54 2011
+++ src/sys/arch/x86/include/bootinfo.h Thu May 16 15:06:45 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: bootinfo.h,v 1.19 2011/11/28 07:56:54 tls Exp $ */
+/* $NetBSD: bootinfo.h,v 1.20 2013/05/16 19:06:45 christos Exp $ */
/*
* Copyright (c) 1997
@@ -157,7 +157,7 @@ struct bi_biosgeom_entry {
unsigned int cksum; /* MBR checksum */
int res0, res1, res2, res3; /* future expansion; 0 now */
#endif
- struct mbr_partition dosparts[MBR_PART_COUNT]; /* MBR itself */
+ struct mbr_partition mbrparts[MBR_PART_COUNT]; /* MBR itself */
} __packed;
struct btinfo_biosgeom {
Index: src/sys/arch/x86/include/bootinfo.h
diff -u src/sys/arch/x86/include/bootinfo.h:1.19 src/sys/arch/x86/include/bootinfo.h:1.21
--- src/sys/arch/x86/include/bootinfo.h:1.19 Mon Nov 28 02:56:54 2011
+++ src/sys/arch/x86/include/bootinfo.h Thu May 16 15:06:45 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: bootinfo.h,v 1.19 2011/11/28 07:56:54 tls Exp $ */
+/* $NetBSD: bootinfo.h,v 1.21 2013/05/16 19:06:45 christos Exp $ */
/*
* Copyright (c) 1997
@@ -157,7 +157,7 @@ struct bi_biosgeom_entry {
unsigned int cksum; /* MBR checksum */
int res0, res1, res2, res3; /* future expansion; 0 now */
#endif
- struct mbr_partition dosparts[MBR_PART_COUNT]; /* MBR itself */
+ struct mbr_partition mbrparts[MBR_PART_COUNT]; /* MBR itself */
} __packed;
struct btinfo_biosgeom {
Index: src/sys/arch/x86/include/bootinfo.h
diff -u src/sys/arch/x86/include/bootinfo.h:1.19 src/sys/arch/x86/include/bootinfo.h:1.22
--- src/sys/arch/x86/include/bootinfo.h:1.19 Mon Nov 28 02:56:54 2011
+++ src/sys/arch/x86/include/bootinfo.h Thu May 16 15:06:45 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: bootinfo.h,v 1.19 2011/11/28 07:56:54 tls Exp $ */
+/* $NetBSD: bootinfo.h,v 1.22 2013/05/16 19:06:45 christos Exp $ */
/*
* Copyright (c) 1997
@@ -157,7 +157,7 @@ struct bi_biosgeom_entry {
unsigned int cksum; /* MBR checksum */
int res0, res1, res2, res3; /* future expansion; 0 now */
#endif
- struct mbr_partition dosparts[MBR_PART_COUNT]; /* MBR itself */
+ struct mbr_partition mbrparts[MBR_PART_COUNT]; /* MBR itself */
} __packed;
struct btinfo_biosgeom {
Index: src/sys/arch/x86/x86/x86_autoconf.c
diff -u src/sys/arch/x86/x86/x86_autoconf.c:1.67 src/sys/arch/x86/x86/x86_autoconf.c:1.68
--- src/sys/arch/x86/x86/x86_autoconf.c:1.67 Sun Apr 28 10:32:55 2013
+++ src/sys/arch/x86/x86/x86_autoconf.c Thu May 16 15:06:45 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: x86_autoconf.c,v 1.67 2013/04/28 14:32:55 christos Exp $ */
+/* $NetBSD: x86_autoconf.c,v 1.68 2013/05/16 19:06:45 christos Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.67 2013/04/28 14:32:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.68 2013/05/16 19:06:45 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -176,7 +176,7 @@ matchbiosdisks(void)
if (be->flags & BI_GEOM_INVALID)
continue;
if (be->cksum == ck &&
- memcmp(&mbr[MBR_PART_OFFSET], be->dosparts,
+ memcmp(&mbr[MBR_PART_OFFSET], be->mbrparts,
MBR_PART_COUNT *
sizeof(struct mbr_partition)) == 0) {
#ifdef GEOM_DEBUG
