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/i386 | |
| 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/i386')
| -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 |
7 files changed, 2 insertions, 9 deletions
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> |
