grub/slr_table.h: indicate Multiboot version in constants

Signed-off-by: Sergii Dmytruk <[email protected]>
TrenchBoot · Jan 5, 2024 · 8566636 · 8566636
1 parent b293777
commit 8566636
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/grub-core/loader/multiboot_mbi2.c b/grub-core/loader/multiboot_mbi2.c
@@ -1178,7 +1178,7 @@ add_multiboot2_slrt_policy_entries (void)
   for (i = 0, cur = modules; i < modcnt; i++, cur = cur->next)
     {
       grub_slaunch_add_slrt_policy_entry (17,
-                                          GRUB_SLR_ET_MULTIBOOT_MODULE,
+                                          GRUB_SLR_ET_MULTIBOOT2_MODULE,
                                           /*flags=*/0,
                                           cur->start,
                                           cur->size,
@@ -1208,7 +1208,7 @@ grub_multiboot2_prepare_slaunch_txt (grub_uint32_t mbi_target,
     }
 
   grub_slaunch_add_slrt_policy_entry (18,
-                                      GRUB_SLR_ET_MULTIBOOT_INFO,
+                                      GRUB_SLR_ET_MULTIBOOT2_INFO,
                                       /*flags=*/0,
                                       mbi_target,
                                       mbi_size,

diff --git a/include/grub/slr_table.h b/include/grub/slr_table.h
@@ -72,8 +72,8 @@
 #define GRUB_SLR_ET_CMDLINE			0x0004
 #define GRUB_SLR_ET_UEFI_MEMMAP			0x0005
 #define GRUB_SLR_ET_RAMDISK			0x0006
-#define GRUB_SLR_ET_MULTIBOOT_INFO		0x0007
-#define GRUB_SLR_ET_MULTIBOOT_MODULE		0x0008
+#define GRUB_SLR_ET_MULTIBOOT2_INFO		0x0007
+#define GRUB_SLR_ET_MULTIBOOT2_MODULE		0x0008
 #define GRUB_SLR_ET_TXT_OS2MLE			0x0010
 #define GRUB_SLR_ET_UNUSED			0xffff