D37095.diff
No OneTemporary
Actions

Size

800 B

Referenced Files

None

Subscribers

None

D37095.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
	@@ -316,6 +316,7 @@
	vm_offset_t size;
	char *rootdevname;
	int howto;
	+ bool is64;
	#if defined(LOADER_FDT_SUPPORT)
	vm_offset_t dtbp;
	int dtb_size;
	@@ -335,6 +336,11 @@
	#endif
	};
	#endif
	+#ifdef __LP64__
	+ is64 = true;
	+#else
	+ is64 = false;
	+#endif

	howto = bi_getboothowto(args);

	@@ -413,7 +419,7 @@
	#endif
	bi_load_efi_data(kfp, exit_bs);

	- size = md_copymodules(0, true);
	+ size = md_copymodules(0, is64);
	kernend = roundup(addr + size, PAGE_SIZE);
	*kernendp = kernend;

	@@ -438,7 +444,7 @@
	#endif

	/* Copy module list and metadata. */
	- (void)md_copymodules(addr, true);
	+ (void)md_copymodules(addr, is64);

	return (0);
	}