diff options
author | phk <phk@FreeBSD.org> | 2003-04-04 16:35:16 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 2003-04-04 16:35:16 +0000 |
commit | 84d6b36e309c74d75565793688f01807fb1340f6 (patch) | |
tree | a6b84bed6839656a8003f724b1f2eec04ec03e0f /sys/boot | |
parent | 4ea6a23f8df49350892e9ec146853181cbce31bb (diff) | |
download | FreeBSD-src-84d6b36e309c74d75565793688f01807fb1340f6.zip FreeBSD-src-84d6b36e309c74d75565793688f01807fb1340f6.tar.gz |
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.
Diffstat (limited to 'sys/boot')
-rw-r--r-- | sys/boot/alpha/libalpha/bootinfo.c | 1 | ||||
-rw-r--r-- | sys/boot/alpha/libalpha/srmdisk.c | 1 | ||||
-rw-r--r-- | sys/boot/arc/lib/arcdisk.c | 1 | ||||
-rw-r--r-- | sys/boot/arc/lib/bootinfo.c | 1 | ||||
-rw-r--r-- | sys/boot/common/commands.c | 1 | ||||
-rw-r--r-- | sys/boot/common/load_elf.c | 1 | ||||
-rw-r--r-- | sys/boot/i386/boot2/boot2.c | 2 | ||||
-rw-r--r-- | sys/boot/i386/gptboot/gptboot.c | 2 | ||||
-rw-r--r-- | sys/boot/i386/libi386/bioscd.c | 2 | ||||
-rw-r--r-- | sys/boot/i386/libi386/biosdisk.c | 2 | ||||
-rw-r--r-- | sys/boot/i386/libi386/elf32_freebsd.c | 1 | ||||
-rw-r--r-- | sys/boot/i386/libi386/elf64_freebsd.c | 1 | ||||
-rw-r--r-- | sys/boot/i386/libi386/elf_freebsd.c | 1 | ||||
-rw-r--r-- | sys/boot/pc98/boot2/disk.c | 2 | ||||
-rw-r--r-- | sys/boot/pc98/boot2/sys.c | 1 | ||||
-rw-r--r-- | sys/boot/pc98/libpc98/biosdisk.c | 3 | ||||
-rw-r--r-- | sys/boot/sparc64/boot1/boot1.c | 2 |
17 files changed, 4 insertions, 21 deletions
diff --git a/sys/boot/alpha/libalpha/bootinfo.c b/sys/boot/alpha/libalpha/bootinfo.c index 60fd45d..cb41bfb 100644 --- a/sys/boot/alpha/libalpha/bootinfo.c +++ b/sys/boot/alpha/libalpha/bootinfo.c @@ -29,7 +29,6 @@ #include <stand.h> #include <string.h> #include <sys/param.h> -#include <sys/reboot.h> #include <sys/linker.h> #include <machine/elf.h> #include <machine/prom.h> diff --git a/sys/boot/alpha/libalpha/srmdisk.c b/sys/boot/alpha/libalpha/srmdisk.c index d7b832d..fc96872 100644 --- a/sys/boot/alpha/libalpha/srmdisk.c +++ b/sys/boot/alpha/libalpha/srmdisk.c @@ -40,7 +40,6 @@ #include <stand.h> #include <sys/disklabel.h> -#include <sys/diskslice.h> #include <machine/stdarg.h> #include <machine/prom.h> diff --git a/sys/boot/arc/lib/arcdisk.c b/sys/boot/arc/lib/arcdisk.c index 116c07c..a6e99a9 100644 --- a/sys/boot/arc/lib/arcdisk.c +++ b/sys/boot/arc/lib/arcdisk.c @@ -40,7 +40,6 @@ #include <stand.h> #include <sys/disklabel.h> -#include <sys/diskslice.h> #include <machine/stdarg.h> diff --git a/sys/boot/arc/lib/bootinfo.c b/sys/boot/arc/lib/bootinfo.c index a0b858c..cea3b1b 100644 --- a/sys/boot/arc/lib/bootinfo.c +++ b/sys/boot/arc/lib/bootinfo.c @@ -29,7 +29,6 @@ #include <stand.h> #include <string.h> #include <sys/param.h> -#include <sys/reboot.h> #include <sys/linker.h> #include <machine/elf.h> #include <machine/prom.h> diff --git a/sys/boot/common/commands.c b/sys/boot/common/commands.c index 75b60bc..be69606 100644 --- a/sys/boot/common/commands.c +++ b/sys/boot/common/commands.c @@ -28,7 +28,6 @@ #include <stand.h> #include <string.h> -#include <sys/reboot.h> #include "bootstrap.h" diff --git a/sys/boot/common/load_elf.c b/sys/boot/common/load_elf.c index cae8d24..63f5d64 100644 --- a/sys/boot/common/load_elf.c +++ b/sys/boot/common/load_elf.c @@ -29,7 +29,6 @@ #include <sys/param.h> #include <sys/exec.h> -#include <sys/reboot.h> #include <sys/linker.h> #include <sys/module.h> #include <string.h> diff --git a/sys/boot/i386/boot2/boot2.c b/sys/boot/i386/boot2/boot2.c index 50f8400..75216ed 100644 --- a/sys/boot/i386/boot2/boot2.c +++ b/sys/boot/i386/boot2/boot2.c @@ -18,8 +18,6 @@ */ #include <sys/param.h> -#include <sys/reboot.h> -#include <sys/diskslice.h> #include <sys/disklabel.h> #include <sys/diskmbr.h> #include <sys/dirent.h> diff --git a/sys/boot/i386/gptboot/gptboot.c b/sys/boot/i386/gptboot/gptboot.c index 50f8400..75216ed 100644 --- a/sys/boot/i386/gptboot/gptboot.c +++ b/sys/boot/i386/gptboot/gptboot.c @@ -18,8 +18,6 @@ */ #include <sys/param.h> -#include <sys/reboot.h> -#include <sys/diskslice.h> #include <sys/disklabel.h> #include <sys/diskmbr.h> #include <sys/dirent.h> diff --git a/sys/boot/i386/libi386/bioscd.c b/sys/boot/i386/libi386/bioscd.c index d957596..88f1c11 100644 --- a/sys/boot/i386/libi386/bioscd.c +++ b/sys/boot/i386/libi386/bioscd.c @@ -40,7 +40,7 @@ #include <stand.h> #include <sys/param.h> -#include <sys/reboot.h> +#include <machine/bootinfo.h> #include <machine/psl.h> #include <stdarg.h> diff --git a/sys/boot/i386/libi386/biosdisk.c b/sys/boot/i386/libi386/biosdisk.c index ff41c1a..658a39c 100644 --- a/sys/boot/i386/libi386/biosdisk.c +++ b/sys/boot/i386/libi386/biosdisk.c @@ -40,7 +40,7 @@ #include <sys/disklabel.h> #include <sys/diskmbr.h> -#include <sys/reboot.h> +#include <machine/bootinfo.h> #include <stdarg.h> diff --git a/sys/boot/i386/libi386/elf32_freebsd.c b/sys/boot/i386/libi386/elf32_freebsd.c index c35cc5a..514183d 100644 --- a/sys/boot/i386/libi386/elf32_freebsd.c +++ b/sys/boot/i386/libi386/elf32_freebsd.c @@ -28,7 +28,6 @@ #include <sys/param.h> #include <sys/exec.h> -#include <sys/reboot.h> #include <sys/linker.h> #include <string.h> #include <machine/bootinfo.h> diff --git a/sys/boot/i386/libi386/elf64_freebsd.c b/sys/boot/i386/libi386/elf64_freebsd.c index c35cc5a..514183d 100644 --- a/sys/boot/i386/libi386/elf64_freebsd.c +++ b/sys/boot/i386/libi386/elf64_freebsd.c @@ -28,7 +28,6 @@ #include <sys/param.h> #include <sys/exec.h> -#include <sys/reboot.h> #include <sys/linker.h> #include <string.h> #include <machine/bootinfo.h> diff --git a/sys/boot/i386/libi386/elf_freebsd.c b/sys/boot/i386/libi386/elf_freebsd.c index c35cc5a..514183d 100644 --- a/sys/boot/i386/libi386/elf_freebsd.c +++ b/sys/boot/i386/libi386/elf_freebsd.c @@ -28,7 +28,6 @@ #include <sys/param.h> #include <sys/exec.h> -#include <sys/reboot.h> #include <sys/linker.h> #include <string.h> #include <machine/bootinfo.h> diff --git a/sys/boot/pc98/boot2/disk.c b/sys/boot/pc98/boot2/disk.c index f0eaf67..f8636eb 100644 --- a/sys/boot/pc98/boot2/disk.c +++ b/sys/boot/pc98/boot2/disk.c @@ -43,8 +43,8 @@ #include "boot.h" #include <sys/disklabel.h> -#include <sys/diskslice.h> #include <sys/diskpc98.h> +#include <machine/bootinfo.h> #define BIOS_DEV_FLOPPY 0x0 #define BIOS_DEV_WIN 0x80 diff --git a/sys/boot/pc98/boot2/sys.c b/sys/boot/pc98/boot2/sys.c index eb65d33..9963ae5 100644 --- a/sys/boot/pc98/boot2/sys.c +++ b/sys/boot/pc98/boot2/sys.c @@ -33,7 +33,6 @@ #include "boot.h" #include <sys/dirent.h> -#include <sys/reboot.h> #if 0 /* #define BUFSIZE 4096 */ diff --git a/sys/boot/pc98/libpc98/biosdisk.c b/sys/boot/pc98/libpc98/biosdisk.c index d1427f9..dd251a7 100644 --- a/sys/boot/pc98/libpc98/biosdisk.c +++ b/sys/boot/pc98/libpc98/biosdisk.c @@ -39,9 +39,8 @@ #include <stand.h> #include <sys/disklabel.h> -#include <sys/diskslice.h> #include <sys/diskpc98.h> -#include <sys/reboot.h> +#include <machine/bootinfo.h> #include <stdarg.h> diff --git a/sys/boot/sparc64/boot1/boot1.c b/sys/boot/sparc64/boot1/boot1.c index 1eeb556..b650f8b 100644 --- a/sys/boot/sparc64/boot1/boot1.c +++ b/sys/boot/sparc64/boot1/boot1.c @@ -20,8 +20,6 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> -#include <sys/reboot.h> -#include <sys/diskslice.h> #include <sys/disklabel.h> #include <sys/dirent.h> #include <machine/elf.h> |