UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

efi/x86: Merge assignments of efi.runtime_version 

efi.runtime_version is always set to the same value on both
existing code paths, so just set it earlier from a shared one.

Tested-by: Tony Luck <tony.luck@intel.com> # arch/ia64
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
This commit is contained in:
Ard Biesheuvel 2020-01-20 18:35:17 +01:00
parent 9cd437ac0e
commit 09308012d8
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
arch/x86/platform/efi/efi.c
View File

@ -420,6 +420,8 @@ static int __init efi_systab_init(u64 phys)
efi_systab.tables = systab32->tables; efi_systab.tables = systab32->tables;
} }
efi.runtime_version = hdr->revision;
efi_systab_report_header(hdr, efi_systab.fw_vendor); efi_systab_report_header(hdr, efi_systab.fw_vendor);
early_memunmap(p, size); early_memunmap(p, size);
@ -870,15 +872,6 @@ static void __init kexec_enter_virtual_mode(void)
} }
efi_sync_low_kernel_mappings(); efi_sync_low_kernel_mappings();
/*
* Now that EFI is in virtual mode, update the function
* pointers in the runtime service table to the new virtual addresses.
*
* Call EFI services through wrapper functions.
*/
efi.runtime_version = efi_systab.hdr.revision;
efi_native_runtime_setup(); efi_native_runtime_setup();
#endif #endif
} }
@ -965,14 +958,6 @@ static void __init __efi_enter_virtual_mode(void)
efi_free_boot_services(); efi_free_boot_services();
/*
* Now that EFI is in virtual mode, update the function
* pointers in the runtime service table to the new virtual addresses.
*
* Call EFI services through wrapper functions.
*/
efi.runtime_version = efi_systab.hdr.revision;
if (!efi_is_mixed()) if (!efi_is_mixed())
efi_native_runtime_setup(); efi_native_runtime_setup();
else else