NuKVM/memtest86plus
3
0
Fork 0
mirror of https://github.com/memtest86plus/memtest86plus.git synced 2025-02-25 18:55:23 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling of EFI memory map when located above 4GB (issue #115)

Browse Source 
The code which saves and restores the upper 32 bits of the address
was not being included, due to a typo in the #ifdef expression.
This commit is contained in:
Martin Whitaker 2022-07-13 20:57:02 +01:00
parent 6b998e82e7
commit c2e94527e1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
boot/efisetup.c
View File

@ -559,7 +559,7 @@ static efi_status_t set_efi_info_and_exit_boot_services(efi_handle_t handle, boo
boot_params->efi_info.mem_desc_version = mem_desc_version;
boot_params->efi_info.mem_map = (uintptr_t)mem_map;
boot_params->efi_info.mem_map_size = mem_map_size;
#ifdef __X86_64__
#ifdef __x86_64__
boot_params->efi_info.sys_tab_hi = (uintptr_t)sys_table >> 32;
boot_params->efi_info.mem_map_hi = (uintptr_t)mem_map >> 32;
#endif
@ -571,7 +571,7 @@ fail:
static void set_e820_map(boot_params_t *params)
{
uintptr_t mem_map_addr = params->efi_info.mem_map;
#ifdef __X86_64__
#ifdef __x86_64__
mem_map_addr |= (uintptr_t)params->efi_info.mem_map_hi << 32;
#endif
size_t mem_map_size = params->efi_info.mem_map_size;