vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix compilation for x86_64-efi.

Browse source
This commit is contained in:
Vladimir Serbinenko 2017-09-07 13:55:22 +02:00 committed by Vincent Batts
parent 219603c2e6
commit 46159d35d3
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
grub-core/loader/multiboot.c
View file

@ -144,7 +144,7 @@ efi_boot (struct grub_relocator *rel,
#else #else
struct grub_relocator_efi_state state_efi = MULTIBOOT_EFI_INITIAL_STATE; struct grub_relocator_efi_state state_efi = MULTIBOOT_EFI_INITIAL_STATE;
#endif #endif
state_efi.MULTIBOOT_EFI_ENTRY_REGISTER = grub_multiboot_payload_eip; state_efi.MULTIBOOT_EFI_ENTRY_REGISTER = GRUB_MULTIBOOT (payload_eip);
state_efi.MULTIBOOT_EFI_MBI_REGISTER = target; state_efi.MULTIBOOT_EFI_MBI_REGISTER = target;
grub_relocator_efi_boot (rel, state_efi); grub_relocator_efi_boot (rel, state_efi);

4
include/grub/i386/multiboot.h
View file

@ -43,6 +43,10 @@
.rcx = 0, \ .rcx = 0, \
.rdx = 0, \ .rdx = 0, \
} }
#define MULTIBOOT2_EFI_INITIAL_STATE { .rax = MULTIBOOT2_BOOTLOADER_MAGIC, \
.rcx = 0, \
.rdx = 0, \
}
#define MULTIBOOT_EFI_ENTRY_REGISTER rip #define MULTIBOOT_EFI_ENTRY_REGISTER rip
#define MULTIBOOT_EFI_MBI_REGISTER rbx #define MULTIBOOT_EFI_MBI_REGISTER rbx
#endif #endif