Skip to content

Commit

Permalink
efi/ia64: Switch to efi_config_parse_tables()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ard Biesheuvel committed Feb 23, 2020
1 parent beaf1c7 commit 6863129
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion arch/ia64/kernel/efi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 6863129

Please sign in to comment.