D3692.diff
No OneTemporary
Actions

Size

929 B

Referenced Files

None

Subscribers

None

D3692.diff
View Options

	Index: head/sys/boot/efi/loader/copy.c
	===================================================================
	--- head/sys/boot/efi/loader/copy.c
	+++ head/sys/boot/efi/loader/copy.c
	@@ -41,7 +41,7 @@
	#define EFI_STAGING_SIZE 48
	#endif

	-#define STAGE_PAGES ((EFI_STAGING_SIZE) * 1024 * 1024 / 4096)
	+#define STAGE_PAGES EFI_SIZE_TO_PAGES((EFI_STAGING_SIZE) * 1024 * 1024)

	EFI_PHYSICAL_ADDRESS staging, staging_end;
	int stage_offset_set = 0;
	@@ -59,7 +59,7 @@
	(unsigned long)(status & EFI_ERROR_MASK));
	return (status);
	}
	- staging_end = staging + STAGE_PAGES * 4096;
	+ staging_end = staging + STAGE_PAGES * EFI_PAGE_SIZE;

	#if defined(__aarch64__) \|\| defined(__arm__)
	/*
	@@ -132,7 +132,7 @@

	src = (uint64_t *)staging;
	dst = (uint64_t *)(staging - stage_offset);
	- last = (uint64_t )(staging + STAGE_PAGES EFI_PAGE_SIZE);
	+ last = (uint64_t *)staging_end;

	while (src < last)
	dst++ = src++;