D28496.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D28496.diff
View Options

	diff --git a/stand/efi/loader/bootinfo.c b/stand/efi/loader/bootinfo.c
	--- a/stand/efi/loader/bootinfo.c
	+++ b/stand/efi/loader/bootinfo.c
	@@ -439,7 +439,7 @@
	struct devdesc *rootdev;
	struct file_metadata *md;
	vm_offset_t addr;
	- uint64_t kernend;
	+ uint64_t kernend, module;
	uint64_t envp;
	vm_offset_t size;
	char *rootdevname;
	@@ -518,6 +518,10 @@
	if (kfp == NULL)
	panic("can't find kernel file");
	kernend = 0; /* fill it in later */
	+
	+ /* Figure out the size and location of the metadata. */
	+ module = *modulep = addr;
	+
	file_addmetadata(kfp, MODINFOMD_HOWTO, sizeof(howto), &howto);
	file_addmetadata(kfp, MODINFOMD_ENVP, sizeof(envp), &envp);
	#if defined(LOADER_FDT_SUPPORT)
	@@ -528,14 +532,13 @@
	"device tree blob found!\n");
	#endif
	file_addmetadata(kfp, MODINFOMD_KERNEND, sizeof(kernend), &kernend);
	+ file_addmetadata(kfp, MODINFOMD_MODULEP, sizeof(module), &module);
	file_addmetadata(kfp, MODINFOMD_FW_HANDLE, sizeof(ST), &ST);
	#ifdef LOADER_GELI_SUPPORT
	geli_export_key_metadata(kfp);
	#endif
	bi_load_efi_data(kfp, exit_bs);

	- /* Figure out the size and location of the metadata. */
	- *modulep = addr;
	size = bi_copymodules(0);
	kernend = roundup(addr + size, PAGE_SIZE);
	*kernendp = kernend;