diff options
author | asami <asami@FreeBSD.org> | 1996-09-07 02:14:47 +0000 |
---|---|---|
committer | asami <asami@FreeBSD.org> | 1996-09-07 02:14:47 +0000 |
commit | 148ce94bebd89be1aab174e5e4af889f43ffdd6d (patch) | |
tree | 76c7c637f26dd9c707e9bc4cb86db9ba6765d078 /sys/pc98/boot | |
parent | 7b9ecd2de3dd0e21793ef47de26c51dbf4b2dff9 (diff) | |
download | FreeBSD-src-148ce94bebd89be1aab174e5e4af889f43ffdd6d.zip FreeBSD-src-148ce94bebd89be1aab174e5e4af889f43ffdd6d.tar.gz |
Yet another merge. Remove support.s by deleting memcopy. Remove
autoconf.c by merging icu.h. Fix a couple of typos.
Submitted by: The FreeBSD(98) Development Team.
Diffstat (limited to 'sys/pc98/boot')
-rw-r--r-- | sys/pc98/boot/biosboot/boot2.S | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/pc98/boot/biosboot/boot2.S b/sys/pc98/boot/biosboot/boot2.S index 1374ad6..48ca722 100644 --- a/sys/pc98/boot/biosboot/boot2.S +++ b/sys/pc98/boot/biosboot/boot2.S @@ -61,11 +61,6 @@ ENTRY(boot2) mov %ax, %es data32 shll $4, %eax -#ifdef NAMEBLOCK - addr32 - data32 - movl %esp, EXT(dflt_name) -#endif /* fix up GDT entries for bootstrap */ #define FIXUP(gdt_index) \ @@ -173,6 +168,10 @@ ENTRY(boot2) rep stosb +#ifdef NAMEBLOCK + movl %esp, EXT(dflt_name) +#endif + movzbl %dl, %edx /* discard head (%dh) and random high bits */ pushl %edx call EXT(boot) |