diff options
| author | bde <bde@FreeBSD.org> | 2003-11-15 10:04:06 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 2003-11-15 10:04:06 +0000 |
| commit | e44f1268ea6c6ba3d8a0b5200b63319b96b9fd76 (patch) | |
| tree | 13acf8e7b71f20ff92a993329306a769b958ce83 /sys/sys/reboot.h | |
| parent | 081986cbdea44621b192a29d45d34655bd949d4a (diff) | |
| download | FreeBSD-src-e44f1268ea6c6ba3d8a0b5200b63319b96b9fd76.zip FreeBSD-src-e44f1268ea6c6ba3d8a0b5200b63319b96b9fd76.tar.gz | |
Changed the RB_PAUSE flag from 0x40000 to 0x100000 and marked the old
value as reserved for internal use in boot blocks, because RB_PAUSE
broke binary compatibility by usurping the RB_DUAL flag. Probably no
one except me has boot blocks for which this matters, since most boot
blocks based on biosboot including pc98's boot2 can't boot elf kernels,
and /boot/loader doesn't properly pass flags set by the previous stage.
reboot.h:
Also mark the historical RB_PROBEKBD flag (0x80000) as reserved for
internal use in boot blocks.
boot2.c:
Added comments to inhibit usurping of other flags.
Approved by: guido, imp
MFC after: 1 week
Diffstat (limited to 'sys/sys/reboot.h')
| -rw-r--r-- | sys/sys/reboot.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/sys/reboot.h b/sys/sys/reboot.h index dd84899..7412e42 100644 --- a/sys/sys/reboot.h +++ b/sys/sys/reboot.h @@ -61,9 +61,11 @@ #define RB_GDB 0x8000 /* use GDB remote debugger instead of DDB */ #define RB_MUTE 0x10000 /* start up with the console muted */ #define RB_SELFTEST 0x20000 /* don't complete the boot; do selftest */ -#define RB_PAUSE 0x40000 /* pause after each output line during probe */ +#define RB_RESERVED1 0x40000 /* reserved for internal use of boot blocks */ +#define RB_RESERVED2 0x80000 /* reserved for internal use of boot blocks */ +#define RB_PAUSE 0x100000 /* pause after each output line during probe */ #define RB_MULTIPLE 0x20000000 /* use multiple consoles */ #define RB_BOOTINFO 0x80000000 /* have `struct bootinfo *' arg */ -#endif /* !_SYS_REBOOT_H_ */ +#endif |
