aboutsummaryrefslogtreecommitdiff
path: root/sys/boot
diff options
context:
space:
mode:
authorPoul-Henning Kamp <phk@FreeBSD.org>2002-10-01 07:24:55 +0000
committerPoul-Henning Kamp <phk@FreeBSD.org>2002-10-01 07:24:55 +0000
commit3bb24c35f2fbffed3f175dc2bc72bb2867ff1198 (patch)
tree64a86680f5023850204fec859db473fd67342761 /sys/boot
parenteade9db908e087a44b43c9adb7fd9754322c2813 (diff)
downloadsrc-3bb24c35f2fbffed3f175dc2bc72bb2867ff1198.tar.gz
src-3bb24c35f2fbffed3f175dc2bc72bb2867ff1198.zip
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.
Notes
Notes: svn path=/head/; revision=104272
Diffstat (limited to 'sys/boot')
-rw-r--r--sys/boot/i386/boot2/boot2.c1
-rw-r--r--sys/boot/i386/gptboot/gptboot.c1
-rw-r--r--sys/boot/i386/libi386/biosdisk.c1
3 files changed, 3 insertions, 0 deletions
diff --git a/sys/boot/i386/boot2/boot2.c b/sys/boot/i386/boot2/boot2.c
index ed1e91ef68ff..1739579ee63c 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 ed1e91ef68ff..1739579ee63c 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 ca4f7eaea262..886bcb9e83eb 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>