diff options
| author | Ard Biesheuvel <ardb@kernel.org> | 2020-01-20 14:58:09 +0100 |
|---|---|---|
| committer | Ard Biesheuvel <ardb@kernel.org> | 2020-02-23 21:59:42 +0100 |
| commit | 686312927b13fc30b23b0e0f9be097c292343048 (patch) | |
| tree | 4c87c3b06ad6aa19bce176f91ae30a46081b4b86 /arch/ia64/kernel/efi.c | |
| parent | efi/ia64: Use local variable for EFI system table address (diff) | |
| download | linux-686312927b13fc30b23b0e0f9be097c292343048.tar.xz linux-686312927b13fc30b23b0e0f9be097c292343048.zip | |
efi/ia64: Switch to efi_config_parse_tables()
IA64 calls efi_config_parse_tables() via efi_config_init(), which
does an explicit memremap() of the tables, which is unnecessary
on IA64. So let's call efi_config_parse_tables() directly, passing
the __va() of the config table array.
Tested-by: Tony Luck <tony.luck@intel.com> # arch/ia64
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Diffstat (limited to 'arch/ia64/kernel/efi.c')
| -rw-r--r-- | arch/ia64/kernel/efi.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c index 81bc5031a115..3b5cf551489c 100644 --- a/arch/ia64/kernel/efi.c +++ b/arch/ia64/kernel/efi.c @@ -531,7 +531,10 @@ efi_init (void) palo_phys = EFI_INVALID_TABLE_ADDR; - if (efi_config_init(arch_tables) != 0) + if (efi_config_parse_tables(__va(efi_systab->tables), + efi_systab->nr_tables, + sizeof(efi_config_table_t), + arch_tables) != 0) return; if (palo_phys != EFI_INVALID_TABLE_ADDR) |