:: commit 4f77bf373c610a9ba10503107d02c641c83f5ef2

mintsuki <mintsuki@protonmail.com> — 2021-10-31 20:51

parents: b5eea0cc60

pmm: Use untouched_memmap instead of memmap in pmm_release_uefi_mem

diff --git a/stage23/mm/pmm.s2.c b/stage23/mm/pmm.s2.c
index ac31e4c0..11bfbeba 100644
--- a/stage23/mm/pmm.s2.c
+++ b/stage23/mm/pmm.s2.c
@@ -518,15 +518,13 @@ another_recl:;
 void pmm_release_uefi_mem(void) {
     EFI_STATUS status;
 
-    sanitise_entries(memmap, &memmap_entries, true);
-
-    for (size_t i = 0; i < memmap_entries; i++) {
-        if (memmap[i].type != MEMMAP_USABLE
-         && memmap[i].type != MEMMAP_BOOTLOADER_RECLAIMABLE) {
+    for (size_t i = 0; i < untouched_memmap_entries; i++) {
+        if (untouched_memmap[i].type != MEMMAP_USABLE
+         && untouched_memmap[i].type != MEMMAP_BOOTLOADER_RECLAIMABLE) {
             continue;
         }
 
-        status = gBS->FreePages(memmap[i].base, memmap[i].length / 4096);
+        status = gBS->FreePages(untouched_memmap[i].base, untouched_memmap[i].length / 4096);
 
         if (status) {
             panic("pmm: FreePages failure (%x)", status);
diff --git a/test/limine.cfg b/test/limine.cfg
index 9d74e626..0f71fecf 100644
--- a/test/limine.cfg
+++ b/test/limine.cfg
@@ -36,6 +36,8 @@ COMMENT=Contains legacy entries.
 
 COMMENT=Stivale1 test.
 
+KASLR=no
+
 PROTOCOL=stivale
 KERNEL_PATH=boot:///boot/test.elf
 KERNEL_CMDLINE=Hi! This is an example!
tab: 248 wrap: offon