diff options
| author | Warner Losh <imp@FreeBSD.org> | 2011-02-16 18:05:10 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2011-02-16 18:05:10 +0000 |
| commit | 33c45e47f403b8eb3f701052d264e937622772e0 (patch) | |
| tree | 300d51d89ac688d2e1b04f5c6cf93a87214b76e4 /sys | |
| parent | dc4f0a9e11b007160b89044731712681dce4a07a (diff) | |
Notes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/boot/i386/boot2/boot2.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/sys/boot/i386/boot2/boot2.c b/sys/boot/i386/boot2/boot2.c index 9e1b617d4bd8a..38497252450da 100644 --- a/sys/boot/i386/boot2/boot2.c +++ b/sys/boot/i386/boot2/boot2.c @@ -347,23 +347,6 @@ load(void) p += roundup2(hdr.ex.a_text, PAGE_SIZE); if (xfsread(ino, p, hdr.ex.a_data)) return; - p += hdr.ex.a_data + roundup2(hdr.ex.a_bss, PAGE_SIZE); - bootinfo.bi_symtab = VTOP(p); - *(uint32_t*)p = hdr.ex.a_syms; - p += sizeof(hdr.ex.a_syms); - if (hdr.ex.a_syms) { - if (xfsread(ino, p, hdr.ex.a_syms)) - return; - p += hdr.ex.a_syms; - if (xfsread(ino, p, sizeof(int))) - return; - x = *(uint32_t *)p; - p += sizeof(int); - x -= sizeof(int); - if (xfsread(ino, p, x)) - return; - p += x; - } } else { fs_off = hdr.eh.e_phoff; for (j = i = 0; i < hdr.eh.e_phnum && j < 2; i++) { @@ -395,8 +378,8 @@ load(void) } } addr = hdr.eh.e_entry & 0xffffff; + bootinfo.bi_esymtab = VTOP(p); } - bootinfo.bi_esymtab = VTOP(p); bootinfo.bi_kernelname = VTOP(kname); bootinfo.bi_bios_dev = dsk.drive; __exec((caddr_t)addr, RB_BOOTINFO | (opts & RBX_MASK), |
