Split MBR and PC98 on-disk sliceformats out from disklabel.h, step 1:

Peter had repocopied sys/disklabel.h to sys/diskpc98.h and sys/diskmbr.h.

These two new copies are still intact copies of disklabel.h and
therefore protected by #ifndef _SYS_DISKLABEL_H_ so #including them
in programs which already include <sys.disklabel.h> is currently a
no-op.

This commit adds a number of such #includes.

Once I have verified that I have fixed all the places which need fixing,
I will commit the updated versions of the three #include files.

Sponsored by:   DARPA & NAI Labs.

14 files changed, 22 insertions, 0 deletions

diff --git a/lib/libdisk/create_chunk.c b/lib/libdisk/create_chunk.c
index f4b6768..8ef3e8d 100644
--- a/lib/libdisk/create_chunk.c
+++ b/lib/libdisk/create_chunk.c
@@ -20,6 +20,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/disklabel.h>
 #include <sys/diskslice.h>
+#include <sys/diskmbr.h>
 #include <sys/mount.h>
 #include <sys/stat.h>
 #include <sys/sysctl.h>
diff --git a/lib/libdisk/disk.c b/lib/libdisk/disk.c
index 28b10b9..9302a80 100644
--- a/lib/libdisk/disk.c
+++ b/lib/libdisk/disk.c
@@ -22,6 +22,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/ioctl.h>
 #include <sys/disklabel.h>
 #include <sys/diskslice.h>
+#include <sys/diskmbr.h>
 #include <paths.h>
 #include "libdisk.h"
 
diff --git a/lib/libdisk/rules.c b/lib/libdisk/rules.c
index 5a01e66..87d7e24 100644
--- a/lib/libdisk/rules.c
+++ b/lib/libdisk/rules.c
@@ -17,6 +17,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/types.h>
 #include <sys/diskslice.h>
 #include <sys/disklabel.h>
+#include <sys/diskmbr.h>
 #include "libdisk.h"
 
 int
diff --git a/lib/libdisk/write_disk.c b/lib/libdisk/write_disk.c
index 8dd5c8e..3e68474 100644
--- a/lib/libdisk/write_disk.c
+++ b/lib/libdisk/write_disk.c
@@ -20,6 +20,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/ioctl.h>
 #include <sys/disklabel.h>
 #include <sys/diskslice.h>
+#include <sys/diskmbr.h>
 #include <paths.h>
 #include "libdisk.h"
 
diff --git a/sbin/bsdlabel/bsdlabel.c b/sbin/bsdlabel/bsdlabel.c
index 17c24d9..81efae5 100644
--- a/sbin/bsdlabel/bsdlabel.c
+++ b/sbin/bsdlabel/bsdlabel.c
@@ -64,6 +64,7 @@ __FBSDID("$FreeBSD$");
 #define DKTYPENAMES
 #define FSTYPENAMES
 #include <sys/disklabel.h>
+#include <sys/diskmbr.h>
 #ifdef __sparc64__
 #include <sys/sun_disklabel.h>
 #endif
diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c
index 17c24d9..81efae5 100644
--- a/sbin/disklabel/disklabel.c
+++ b/sbin/disklabel/disklabel.c
@@ -64,6 +64,7 @@ __FBSDID("$FreeBSD$");
 #define DKTYPENAMES
 #define FSTYPENAMES
 #include <sys/disklabel.h>
+#include <sys/diskmbr.h>
 #ifdef __sparc64__
 #include <sys/sun_disklabel.h>
 #endif
diff --git a/sbin/fdisk/fdisk.c b/sbin/fdisk/fdisk.c
index b3145e4..59572f6 100644
--- a/sbin/fdisk/fdisk.c
+++ b/sbin/fdisk/fdisk.c
@@ -31,6 +31,7 @@ static const char rcsid[] =
 
 #include <sys/disk.h>
 #include <sys/disklabel.h>
+#include <sys/diskmbr.h>
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/mount.h>
diff --git a/sys/boot/i386/boot2/boot2.c b/sys/boot/i386/boot2/boot2.c
index ed1e91e..1739579 100644
--- a/sys/boot/i386/boot2/boot2.c
+++ b/sys/boot/i386/boot2/boot2.c
@@ -21,6 +21,7 @@
 #include <sys/reboot.h>
 #include <sys/diskslice.h>
 #include <sys/disklabel.h>
+#include <sys/diskmbr.h>
 #include <sys/dirent.h>
 #include <machine/bootinfo.h>
 #include <machine/elf.h>
diff --git a/sys/boot/i386/gptboot/gptboot.c b/sys/boot/i386/gptboot/gptboot.c
index ed1e91e..1739579 100644
--- a/sys/boot/i386/gptboot/gptboot.c
+++ b/sys/boot/i386/gptboot/gptboot.c
@@ -21,6 +21,7 @@
 #include <sys/reboot.h>
 #include <sys/diskslice.h>
 #include <sys/disklabel.h>
+#include <sys/diskmbr.h>
 #include <sys/dirent.h>
 #include <machine/bootinfo.h>
 #include <machine/elf.h>
diff --git a/sys/boot/i386/libi386/biosdisk.c b/sys/boot/i386/libi386/biosdisk.c
index ca4f7ea..886bcb9 100644
--- a/sys/boot/i386/libi386/biosdisk.c
+++ b/sys/boot/i386/libi386/biosdisk.c
@@ -40,6 +40,7 @@
 
 #include <sys/disklabel.h>
 #include <sys/diskslice.h>
+#include <sys/diskmbr.h>
 #include <sys/reboot.h>
 
 #include <stdarg.h>
diff --git a/sys/kern/subr_diskmbr.c b/sys/kern/subr_diskmbr.c
index 3457c01..596bb95 100644
--- a/sys/kern/subr_diskmbr.c
+++ b/sys/kern/subr_diskmbr.c
@@ -49,6 +49,7 @@
 #endif
 #include <sys/disk.h>
 #include <sys/disklabel.h>
+#include <sys/diskmbr.h>
 #define	DOSPTYP_EXTENDED	5
 #define	DOSPTYP_EXTENDEDX	15
 #define	DOSPTYP_ONTRACK		84
diff --git a/sys/kern/subr_diskslice.c b/sys/kern/subr_diskslice.c
index 1b7f9e7..25b646a 100644
--- a/sys/kern/subr_diskslice.c
+++ b/sys/kern/subr_diskslice.c
@@ -53,6 +53,11 @@
 #include <sys/disk.h>
 #include <sys/disklabel.h>
 #include <sys/diskslice.h>
+#if defined(PC98) && !defined(PC98_ATCOMPAT)
+#include <sys/diskpc98.h>
+#else
+#include <sys/diskmbr.h>
+#endif
 #include <sys/fcntl.h>
 #include <sys/malloc.h>
 #include <sys/stat.h>
diff --git a/sys/pc98/pc98/diskslice_machdep.c b/sys/pc98/pc98/diskslice_machdep.c
index 42b98d3..13cf65b 100644
--- a/sys/pc98/pc98/diskslice_machdep.c
+++ b/sys/pc98/pc98/diskslice_machdep.c
@@ -56,6 +56,11 @@
 #define	DOSPTYP_EXTENDEDX	15
 #define	DOSPTYP_ONTRACK		84
 #endif
+#if defined(PC98) && !defined(PC98_ATCOMPAT)
+#include <sys/diskpc98.h>
+#else
+#include <sys/diskmbr.h>
+#endif
 #include <sys/diskslice.h>
 #include <sys/malloc.h>
 #include <sys/syslog.h>
diff --git a/usr.sbin/boot0cfg/boot0cfg.c b/usr.sbin/boot0cfg/boot0cfg.c
index 8dfd9b1..d2ad26b 100644
--- a/usr.sbin/boot0cfg/boot0cfg.c
+++ b/usr.sbin/boot0cfg/boot0cfg.c
@@ -31,6 +31,7 @@ static const char rcsid[] =
 
 #include <sys/param.h>
 #include <sys/disklabel.h>
+#include <sys/diskmbr.h>
 #include <sys/stat.h>
 
 #include <err.h>