Skip to content

Commit 75f6098

Browse files
committed
misc: Update the name of "ACPI Tables" -> "Reserved (Mapped)" memory entries
1 parent f31a9fb commit 75f6098

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

common/lib/acpi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ static void map_single_table(uint64_t addr, uint32_t len) {
253253
uint64_t memmap_type = pmm_check_type(addr);
254254

255255
if (memmap_type != MEMMAP_ACPI_RECLAIMABLE && memmap_type != MEMMAP_ACPI_NVS) {
256-
memmap_alloc_range(addr, length, MEMMAP_ACPI_TABLES, 0, true, false, true);
256+
memmap_alloc_range(addr, length, MEMMAP_RESERVED_MAPPED, 0, true, false, true);
257257
}
258258
}
259259

common/mm/pmm.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ struct memmap_entry {
2020
#define MEMMAP_BOOTLOADER_RECLAIMABLE 0x1000
2121
#define MEMMAP_KERNEL_AND_MODULES 0x1001
2222
#define MEMMAP_FRAMEBUFFER 0x1002
23-
#define MEMMAP_ACPI_TABLES 0x1003
23+
#define MEMMAP_RESERVED_MAPPED 0x1003
2424
#define MEMMAP_EFI_RECLAIMABLE 0x2000
2525

2626
struct meminfo {

common/mm/pmm.s2.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ static const char *memmap_type(uint32_t type) {
6969
return "Usable RAM";
7070
case MEMMAP_RESERVED:
7171
return "Reserved";
72-
case MEMMAP_ACPI_TABLES:
73-
return "ACPI tables";
72+
case MEMMAP_RESERVED_MAPPED:
73+
return "Reserved (Mapped)";
7474
case MEMMAP_ACPI_RECLAIMABLE:
7575
return "ACPI reclaimable";
7676
case MEMMAP_ACPI_NVS:
@@ -210,10 +210,10 @@ void pmm_sanitise_entries(struct memmap_entry *m, size_t *_count, bool align_ent
210210
m[p] = min_e;
211211
}
212212

213-
// Merge contiguous bootloader-reclaimable, ACPI tables, usable entries
213+
// Merge contiguous bootloader-reclaimable, reserved (mapped), usable entries
214214
for (size_t i = 0; i < count - 1; i++) {
215215
if (m[i].type != MEMMAP_BOOTLOADER_RECLAIMABLE
216-
&& m[i].type != MEMMAP_ACPI_TABLES
216+
&& m[i].type != MEMMAP_RESERVED_MAPPED
217217
&& m[i].type != MEMMAP_USABLE)
218218
continue;
219219

common/protos/limine.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1583,8 +1583,8 @@ FEAT_START
15831583
case MEMMAP_USABLE:
15841584
_memmap[i].type = LIMINE_MEMMAP_USABLE;
15851585
break;
1586-
case MEMMAP_ACPI_TABLES:
1587-
_memmap[i].type = LIMINE_MEMMAP_ACPI_TABLES;
1586+
case MEMMAP_RESERVED_MAPPED:
1587+
_memmap[i].type = LIMINE_MEMMAP_RESERVED_MAPPED;
15881588
break;
15891589
case MEMMAP_ACPI_RECLAIMABLE:
15901590
_memmap[i].type = LIMINE_MEMMAP_ACPI_RECLAIMABLE;

test/limine.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,8 @@ static char *get_memmap_type(uint64_t type) {
190190
return "Usable";
191191
case LIMINE_MEMMAP_RESERVED:
192192
return "Reserved";
193-
case LIMINE_MEMMAP_ACPI_TABLES:
194-
return "ACPI tables";
193+
case LIMINE_MEMMAP_RESERVED_MAPPED:
194+
return "Reserved (Mapped)";
195195
case LIMINE_MEMMAP_ACPI_RECLAIMABLE:
196196
return "ACPI reclaimable";
197197
case LIMINE_MEMMAP_ACPI_NVS:

0 commit comments

Comments
 (0)