Aren/rulimine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pmm: Use untouched_memmap instead of memmap in pmm_release_uefi_mem

Browse Source
This commit is contained in:
mintsuki 2021-10-31 21:51:06 +01:00
parent 6f0d7228f1
commit f176e24376
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
stage23/mm/pmm.s2.c
View File

@ -518,15 +518,13 @@ another_recl:;
void pmm_release_uefi_mem(void) { void pmm_release_uefi_mem(void) {
EFI_STATUS status; EFI_STATUS status;
sanitise_entries(memmap, &memmap_entries, true); for (size_t i = 0; i < untouched_memmap_entries; i++) {
if (untouched_memmap[i].type != MEMMAP_USABLE
for (size_t i = 0; i < memmap_entries; i++) { && untouched_memmap[i].type != MEMMAP_BOOTLOADER_RECLAIMABLE) {
if (memmap[i].type != MEMMAP_USABLE
&& memmap[i].type != MEMMAP_BOOTLOADER_RECLAIMABLE) {
continue; 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) { if (status) {
panic("pmm: FreePages failure (%x)", status); panic("pmm: FreePages failure (%x)", status);

2
test/limine.cfg
View File

@ -36,6 +36,8 @@ COMMENT=Contains legacy entries.
COMMENT=Stivale1 test. COMMENT=Stivale1 test.
KASLR=no
PROTOCOL=stivale PROTOCOL=stivale
KERNEL_PATH=boot:///boot/test.elf KERNEL_PATH=boot:///boot/test.elf
KERNEL_CMDLINE=Hi! This is an example! KERNEL_CMDLINE=Hi! This is an example!