d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Back out rev. 1.71 as it breaks directly loading (i386) kernels.

Browse Source 
OK'ed by:	jhb
PR:		i386/96430, i386/104709
MFC after:	3 days
This commit is contained in:
Ruslan Ermilov 2006-10-26 19:15:54 +00:00
parent a10892b064
commit 5098c00abe
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/boot/i386/boot2/boot2.c
View File

@ -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);

6
sys/boot/i386/gptboot/gptboot.c
View File

@ -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);