Date: Fri, 27 Aug 2021 16:49:43 GMT From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: b850806921a7 - main - Restore the definition of EFI_STAGING_SIZE Message-ID: <202108271649.17RGnhMa082262@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b850806921a735f3f307bc4b2634c7e9008f5a9c commit b850806921a735f3f307bc4b2634c7e9008f5a9c Author: Konstantin Belousov <kib@FreeBSD.org> AuthorDate: 2021-08-26 19:32:42 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> CommitDate: 2021-08-27 16:48:53 +0000 Restore the definition of EFI_STAGING_SIZE The definition can be overridden by users, and before f75caed644a5c it was in MBs. Make the symbol' unit MB, to be compatible with users customizations. Reported and tested by: Harry Schmalzbauer <freebsd@omnilan.de> Sponsored by: The FreeBSD Foundation MFC after: 1 week --- 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 ba5da28aee92..65f595c12b11 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?202108271649.17RGnhMa082262>