Date: Fri, 3 Sep 2021 01:08:55 GMT From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 8a51116a8660 - stable/13 - Restore the definition of EFI_STAGING_SIZE Message-ID: <202109030108.18318taN004627@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8a51116a86606f12c4ca447b23a1f94d36335d7e commit 8a51116a86606f12c4ca447b23a1f94d36335d7e Author: Konstantin Belousov <kib@FreeBSD.org> AuthorDate: 2021-08-26 19:32:42 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> CommitDate: 2021-09-03 01:08:35 +0000 Restore the definition of EFI_STAGING_SIZE (cherry picked from commit b850806921a735f3f307bc4b2634c7e9008f5a9c) --- stand/efi/loader/copy.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stand/efi/loader/copy.c b/stand/efi/loader/copy.c index b8ed4c8e027e..3f3d46346b7c 100644 --- a/stand/efi/loader/copy.c +++ b/stand/efi/loader/copy.c @@ -180,9 +180,9 @@ out: #ifndef EFI_STAGING_SIZE #if defined(__arm__) -#define EFI_STAGING_SIZE M(32) +#define EFI_STAGING_SIZE 32 #else -#define EFI_STAGING_SIZE M(64) +#define EFI_STAGING_SIZE 64 #endif #endif @@ -315,7 +315,7 @@ efi_copy_init(void) EFI_STATUS status; unsigned long nr_pages; - nr_pages = EFI_SIZE_TO_PAGES((EFI_STAGING_SIZE)); + nr_pages = EFI_SIZE_TO_PAGES(M(1) * (EFI_STAGING_SIZE)); #if defined(__i386__) || defined(__amd64__) /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202109030108.18318taN004627>