From 72a6cefb676580a477cf44be390192249677b561 Mon Sep 17 00:00:00 2001 From: ru Date: Thu, 26 Oct 2006 19:15:54 +0000 Subject: Back out rev. 1.71 as it breaks directly loading (i386) kernels. OK'ed by: jhb PR: i386/96430, i386/104709 MFC after: 3 days --- sys/boot/i386/gptboot/gptboot.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sys/boot/i386/gptboot') diff --git a/sys/boot/i386/gptboot/gptboot.c b/sys/boot/i386/gptboot/gptboot.c index bb6d171..9e239be 100644 --- a/sys/boot/i386/gptboot/gptboot.c +++ b/sys/boot/i386/gptboot/gptboot.c @@ -332,7 +332,7 @@ load(void) return; } if (fmt == 0) { - addr = hdr.ex.a_entry; + addr = hdr.ex.a_entry & 0xffffff; p = PTOV(addr); fs_off = PAGE_SIZE; if (xfsread(ino, p, hdr.ex.a_text)) @@ -366,7 +366,7 @@ load(void) j++; } for (i = 0; i < 2; i++) { - p = PTOV(ep[i].p_paddr); + p = PTOV(ep[i].p_paddr & 0xffffff); fs_off = ep[i].p_offset; if (xfsread(ino, p, ep[i].p_filesz)) return; @@ -387,7 +387,7 @@ load(void) p += es[i].sh_size; } } - addr = hdr.eh.e_entry; + addr = hdr.eh.e_entry & 0xffffff; } bootinfo.bi_esymtab = VTOP(p); bootinfo.bi_kernelname = VTOP(kname); -- cgit v1.1