From 85666363268ce64eca73584c28210d4d12d1fe44 Mon Sep 17 00:00:00 2001 From: Sergii Dmytruk Date: Sat, 6 Jan 2024 00:43:02 +0200 Subject: [PATCH] grub/slr_table.h: indicate Multiboot version in constants Signed-off-by: Sergii Dmytruk --- grub-core/loader/multiboot_mbi2.c | 4 ++-- include/grub/slr_table.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/grub-core/loader/multiboot_mbi2.c b/grub-core/loader/multiboot_mbi2.c index aee266e2f..fd93bc0e4 100644 --- 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 index 5fe2b0ce4..59074723b 100644 --- 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