From 5d5411e012b6e89fc6ff5297c3a6c6735cfe5914 Mon Sep 17 00:00:00 2001 From: jhb Date: Thu, 5 Nov 2015 20:21:43 +0000 Subject: [PATCH] MFC 288372: Use EFI page size constants instead of hardcoding 4096. git-svn-id: svn://svn.freebsd.org/base/stable/10@290411 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sys/boot/amd64/efi/copy.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/boot/amd64/efi/copy.c b/sys/boot/amd64/efi/copy.c index 705fb05e0..cd8b6da6b 100644 --- a/sys/boot/amd64/efi/copy.c +++ b/sys/boot/amd64/efi/copy.c @@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$"); #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 @@ x86_efi_copy_init(void) (unsigned long)(status & EFI_ERROR_MASK)); return (status); } - staging_end = staging + STAGE_PAGES * 4096; + staging_end = staging + STAGE_PAGES * EFI_PAGE_SIZE; return (0); } @@ -114,7 +114,7 @@ x86_efi_copy_finish(void) 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++; -- 2.45.0