:: commit 9da003d53fa08bef948dacfa44eb21cde6803720

mintsuki <mintsuki@protonmail.com> — 2022-10-17 02:41

parents: ac61b6a6f7

pmm: Fix AllocatePages() call to take pages count; remove useless alignment check

diff --git a/common/mm/pmm.s2.c b/common/mm/pmm.s2.c
index b7b28699..ef1fd8f9 100644
--- a/common/mm/pmm.s2.c
+++ b/common/mm/pmm.s2.c
@@ -403,11 +403,10 @@ void init_memmap(void) {
 
         if (status) {
             for (size_t j = 0; j < memmap[i].length; j += 4096) {
-                uint64_t length = memmap[i].length - j < 4096 ? memmap[i].length - j : 4096;
                 base = memmap[i].base + j;
-                status = gBS->AllocatePages(AllocateAddress, EfiLoaderData, length, &base);
+                status = gBS->AllocatePages(AllocateAddress, EfiLoaderData, 1, &base);
                 if (status) {
-                    memmap_alloc_range(base, length, MEMMAP_EFI_RECLAIMABLE, MEMMAP_USABLE, true, false, false);
+                    memmap_alloc_range(base, 4096, MEMMAP_EFI_RECLAIMABLE, MEMMAP_USABLE, true, false, false);
                 }
             }
         }
tab: 248 wrap: offon