:: commit dce8d312ea3bf4318e4c55618c4bceb2ecc854e1

mintsuki <mintsuki@protonmail.com> — 2021-04-01 18:05

parents: 59dd147bf4

stivale2: Report correct kernel/modules memory map type value

diff --git a/stage23/protos/stivale.c b/stage23/protos/stivale.c
index 5048b6cb..6263c4ea 100644
--- a/stage23/protos/stivale.c
+++ b/stage23/protos/stivale.c
@@ -67,7 +67,7 @@ void stivale_load(char *config, char *cmdline) {
                 level5pg = true;
             }
 
-            if (elf64_load(kernel, &entry_point, &slide, 10))
+            if (elf64_load(kernel, &entry_point, &slide, STIVALE_MMAP_KERNEL_AND_MODULES))
                 panic("stivale: ELF64 load failure");
 
             ret = elf64_load_section(kernel, &stivale_hdr, ".stivalehdr", sizeof(struct stivale_header), slide);
diff --git a/stage23/protos/stivale2.c b/stage23/protos/stivale2.c
index 47747384..ee76aacb 100644
--- a/stage23/protos/stivale2.c
+++ b/stage23/protos/stivale2.c
@@ -85,7 +85,7 @@ void stivale2_load(char *config, char *cmdline, bool pxe, void *efi_system_table
                 level5pg = true;
             }
 
-            if (elf64_load(kernel, &entry_point, &slide, 10))
+            if (elf64_load(kernel, &entry_point, &slide, STIVALE2_MMAP_KERNEL_AND_MODULES))
                 panic("stivale2: ELF64 load failure");
 
             ret = elf64_load_section(kernel, &stivale2_hdr, ".stivale2hdr", sizeof(struct stivale2_header), slide);
tab: 248 wrap: offon