From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f41.google.com ([74.125.82.41]:35542 "EHLO mail-wm0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1426143AbdEZLg4 (ORCPT ); Fri, 26 May 2017 07:36:56 -0400 Received: by mail-wm0-f41.google.com with SMTP id b84so126469322wmh.0 for ; Fri, 26 May 2017 04:36:55 -0700 (PDT) From: Matt Fleming To: Ingo Molnar , Thomas Gleixner , "H . Peter Anvin" Cc: Juergen Gross , Ard Biesheuvel , linux-kernel@vger.kernel.org, linux-efi@vger.kernel.org, Matt Fleming , stable@vger.kernel.org Subject: [PATCH 1/5] efi: Don't issue error message when booted under xen Date: Fri, 26 May 2017 12:36:47 +0100 Message-Id: <20170526113652.21339-2-matt@codeblueprint.co.uk> In-Reply-To: <20170526113652.21339-1-matt@codeblueprint.co.uk> References: <20170526113652.21339-1-matt@codeblueprint.co.uk> Sender: stable-owner@vger.kernel.org List-ID: From: Juergen Gross When booted as Xen dom0 there won't be an EFI memmap allocated. Avoid issuing an error message in this case: [ 0.144079] efi: Failed to allocate new EFI memmap Signed-off-by: Juergen Gross Cc: "H. Peter Anvin" Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Ard Biesheuvel Cc: # v4.9+ Signed-off-by: Matt Fleming --- arch/x86/platform/efi/quirks.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/x86/platform/efi/quirks.c b/arch/x86/platform/efi/quirks.c index 26615991d69c..e0cf95a83f3f 100644 --- a/arch/x86/platform/efi/quirks.c +++ b/arch/x86/platform/efi/quirks.c @@ -360,6 +360,9 @@ void __init efi_free_boot_services(void) free_bootmem_late(start, size); } + if (!num_entries) + return; + new_size = efi.memmap.desc_size * num_entries; new_phys = efi_memmap_alloc(num_entries); if (!new_phys) { -- 2.12.2