Libdisk does not need to include <sys/diskslice.h> any more.

Move the remaining bits of <sys/diskslice.h> to <i386/include/bootinfo.h>

Move i386/pc98 specific bits from <sys/reboot.h> to
<i386/include/bootinfo.h> as well.

Adjust includes in sys/boot accordingly.

9 files changed, 0 insertions, 9 deletions

diff --git a/lib/libdisk/create_chunk.c b/lib/libdisk/create_chunk.c
index ac7a544..330ccc8 100644
--- a/lib/libdisk/create_chunk.c
+++ b/lib/libdisk/create_chunk.c
@@ -19,7 +19,6 @@ __FBSDID("$FreeBSD$");
 #include <stdarg.h>
 #include <sys/param.h>
 #include <sys/disklabel.h>
-#include <sys/diskslice.h>
 #ifdef PC98
 #include <sys/diskpc98.h>
 #else
diff --git a/lib/libdisk/disk.c b/lib/libdisk/disk.c
index d57e9cd..319a065 100644
--- a/lib/libdisk/disk.c
+++ b/lib/libdisk/disk.c
@@ -23,7 +23,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/disklabel.h>
-#include <sys/diskslice.h>
 #include <sys/uuid.h>
 #include <sys/gpt.h>
 #include <paths.h>
diff --git a/lib/libdisk/rules.c b/lib/libdisk/rules.c
index a49c587..4d6c49f 100644
--- a/lib/libdisk/rules.c
+++ b/lib/libdisk/rules.c
@@ -15,7 +15,6 @@ __FBSDID("$FreeBSD$");
 #include <unistd.h>
 #include <string.h>
 #include <sys/types.h>
-#include <sys/diskslice.h>
 #include <sys/disklabel.h>
 #ifdef PC98
 #include <sys/diskpc98.h>
diff --git a/lib/libdisk/write_alpha_disk.c b/lib/libdisk/write_alpha_disk.c
index 7adf733..174bc8c 100644
--- a/lib/libdisk/write_alpha_disk.c
+++ b/lib/libdisk/write_alpha_disk.c
@@ -19,7 +19,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/disklabel.h>
-#include <sys/diskslice.h>
 #include <paths.h>
 #include "libdisk.h"
 
diff --git a/lib/libdisk/write_amd64_disk.c b/lib/libdisk/write_amd64_disk.c
index 658fe23..f409ae4 100644
--- a/lib/libdisk/write_amd64_disk.c
+++ b/lib/libdisk/write_amd64_disk.c
@@ -18,7 +18,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/disklabel.h>
-#include <sys/diskslice.h>
 #include <sys/diskmbr.h>
 #include <paths.h>
 #include "libdisk.h"
diff --git a/lib/libdisk/write_disk.c b/lib/libdisk/write_disk.c
index e56ed9d..8c2aa54 100644
--- a/lib/libdisk/write_disk.c
+++ b/lib/libdisk/write_disk.c
@@ -19,7 +19,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/disklabel.h>
-#include <sys/diskslice.h>
 #include <paths.h>
 #include "libdisk.h"
 
diff --git a/lib/libdisk/write_i386_disk.c b/lib/libdisk/write_i386_disk.c
index 658fe23..f409ae4 100644
--- a/lib/libdisk/write_i386_disk.c
+++ b/lib/libdisk/write_i386_disk.c
@@ -18,7 +18,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/disklabel.h>
-#include <sys/diskslice.h>
 #include <sys/diskmbr.h>
 #include <paths.h>
 #include "libdisk.h"
diff --git a/lib/libdisk/write_ia64_disk.c b/lib/libdisk/write_ia64_disk.c
index fe2b26c..33113e1 100644
--- a/lib/libdisk/write_ia64_disk.c
+++ b/lib/libdisk/write_ia64_disk.c
@@ -18,7 +18,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/disklabel.h>
-#include <sys/diskslice.h>
 #include <sys/diskmbr.h>
 #include <paths.h>
 #include "libdisk.h"
diff --git a/lib/libdisk/write_pc98_disk.c b/lib/libdisk/write_pc98_disk.c
index ca4688b..c6bb687 100644
--- a/lib/libdisk/write_pc98_disk.c
+++ b/lib/libdisk/write_pc98_disk.c
@@ -20,7 +20,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/disklabel.h>
-#include <sys/diskslice.h>
 #include <sys/diskpc98.h>
 #include <paths.h>
 #include "libdisk.h"