Commit-ID: 457ea3f7e97881f937136ce0ba1f29f82b9abdb0 Gitweb: http://git.kernel.org/tip/457ea3f7e97881f937136ce0ba1f29f82b9abdb0 Author: Daniel Kiper <daniel.ki...@oracle.com> AuthorDate: Thu, 22 Jun 2017 12:51:36 +0200 Committer: Ingo Molnar <mi...@kernel.org> CommitDate: Fri, 23 Jun 2017 11:11:02 +0200
efi: Process the MEMATTR table only if EFI_MEMMAP is enabled Otherwise e.g. Xen dom0 on x86_64 EFI platforms crashes. In theory we can check EFI_PARAVIRT too, however, EFI_MEMMAP looks more targeted and covers more cases. Signed-off-by: Daniel Kiper <daniel.ki...@oracle.com> Reviewed-by: Ard Biesheuvel <ard.biesheu...@linaro.org> Cc: Linus Torvalds <torva...@linux-foundation.org> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Thomas Gleixner <t...@linutronix.de> Cc: andrew.coop...@citrix.com Cc: boris.ostrov...@oracle.com Cc: jgr...@suse.com Cc: linux-...@vger.kernel.org Cc: m...@codeblueprint.co.uk Cc: sta...@vger.kernel.org Cc: xen-de...@lists.xenproject.org Link: http://lkml.kernel.org/r/1498128697-12943-2-git-send-email-daniel.ki...@oracle.com Signed-off-by: Ingo Molnar <mi...@kernel.org> --- drivers/firmware/efi/efi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c index b372aad..045d6d3 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -528,7 +528,8 @@ int __init efi_config_parse_tables(void *config_tables, int count, int sz, } } - efi_memattr_init(); + if (efi_enabled(EFI_MEMMAP)) + efi_memattr_init(); /* Parse the EFI Properties table if it exists */ if (efi.properties_table != EFI_INVALID_TABLE_ADDR) {
