Page MenuHomeFreeBSD
Files F151133281

D19374.id54443.diff
No OneTemporary
Actions

D19374.id54443.diff
View Options

Index: stand/efi/loader/arch/arm/exec.c
===================================================================
--- stand/efi/loader/arch/arm/exec.c
+++ stand/efi/loader/arch/arm/exec.c
@@ -74,16 +74,19 @@
e = (Elf_Ehdr *)&fmp->md_data;
efi_time_fini();
+
+ entry = efi_translate(e->e_entry);
+
+ printf("Kernel entry at 0x%x...\n", (unsigned)entry);
+ printf("Kernel args: %s\n", fp->f_args);
+
if ((error = bi_load(fp->f_args, &modulep, &kernend)) != 0) {
efi_time_init();
return (error);
}
- entry = efi_translate(e->e_entry);
- printf("Kernel entry at 0x%x...\n", (unsigned)entry);
- printf("Kernel args: %s\n", fp->f_args);
- printf("modulep: %#x\n", modulep);
- printf("relocation_offset %llx\n", __elfN(relocation_offset));
+ /* At this point we've called ExitBootServices, so we can't call
+ * printf or any other function that allocates memory */
dev_cleanup();
Index: stand/efi/loader/arch/i386/elf32_freebsd.c
===================================================================
--- stand/efi/loader/arch/i386/elf32_freebsd.c
+++ stand/efi/loader/arch/i386/elf32_freebsd.c
@@ -75,14 +75,19 @@
ehdr = (Elf_Ehdr *)&(md->md_data);
efi_time_fini();
+
+ entry = ehdr->e_entry & 0xffffff;
+
+ printf("Start @ 0x%x ...\n", entry);
+
err = bi_load(fp->f_args, &modulep, &kernend);
if (err != 0) {
efi_time_init();
return(err);
}
- entry = ehdr->e_entry & 0xffffff;
- printf("Start @ 0x%x ...\n", entry);
+ /* At this point we've called ExitBootServices, so we can't call
+ * printf or any other function that allocates memory */
dev_cleanup();
__exec((void *)entry, boothowto, bootdev, 0, 0, 0, bootinfop, modulep, kernend);

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 7, 7:44 AM (9 h, 14 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31019223
Default Alt Text
D19374.id54443.diff (1 KB)

Event Timeline