29c29
< __FBSDID("$FreeBSD: head/sys/boot/common/load_elf.c 215811 2010-11-25 03:16:31Z emaste $");
---
> __FBSDID("$FreeBSD: head/sys/boot/common/load_elf.c 220311 2011-04-03 22:31:51Z marcel $");
100d99
< u_int pad;
160,165d158
< /* Page-align the load address */
< pad = (u_int)dest & PAGE_MASK;
< if (pad != 0) {
< pad = PAGE_SIZE - pad;
< dest += pad;
< }
176c169
< dest = ehdr->e_entry;
---
> dest = (ehdr->e_entry & ~PAGE_MASK);
188a182,186
> if (archsw.arch_loadaddr != NULL)
> dest = archsw.arch_loadaddr(LOAD_ELF, ehdr, dest);
> else
> dest = roundup(dest, PAGE_SIZE);
>
205c203
< printf("%s entry at 0x%jx\n", filename, (uintmax_t)dest);
---
> printf("%s entry at 0x%jx\n", filename, (uintmax_t)ehdr->e_entry);
364a363,365
> if (archsw.arch_loadseg != NULL)
> archsw.arch_loadseg(ehdr, phdr + i, off);
>