diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2016-08-16 20:19:05 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2016-08-16 20:19:05 +0000 |
| commit | 27067774dce3388702a4cf744d7096c6fb71b688 (patch) | |
| tree | 56300949abd050b3cd2e23d29210d2a567bc8aec /sys/boot/i386/btx/btxldr/btxldr.S | |
| parent | 44be0a8ea517cbe7a9140bca20e1e93228ac0a04 (diff) | |
| parent | 915a263ea24ab051bb57674a4d6f5ffe4ef0d5b5 (diff) | |
Merge ^/head r303250 through r304235.
Notes
Notes:
svn path=/projects/clang390-import/; revision=304236
Diffstat (limited to 'sys/boot/i386/btx/btxldr/btxldr.S')
| -rw-r--r-- | sys/boot/i386/btx/btxldr/btxldr.S | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/boot/i386/btx/btxldr/btxldr.S b/sys/boot/i386/btx/btxldr/btxldr.S index 848b930b7907..c3e544e3a6fb 100644 --- a/sys/boot/i386/btx/btxldr/btxldr.S +++ b/sys/boot/i386/btx/btxldr/btxldr.S @@ -382,12 +382,12 @@ e_fmt: .asciz "Error: Client format not supported\n" #ifdef BTXLDR_VERBOSE m_mem: .asciz "Starting in protected mode (base mem=\0)\n" m_esp: .asciz "Arguments passed (esp=\0):\n" -m_args: .asciz"<howto=" - .asciz" bootdev=" - .asciz" junk=" - .asciz" " - .asciz" " - .asciz" bootinfo=\0>\n" +m_args: .asciz "<howto=" + .asciz " bootdev=" + .asciz " junk=" + .asciz " " + .asciz " " + .asciz " bootinfo=\0>\n" m_rel_bi: .asciz "Relocated bootinfo (size=48) to \0\n" m_rel_args: .asciz "Relocated arguments (size=18) to \0\n" m_rel_btx: .asciz "Relocated kernel (size=\0) to \0\n" |