[PATCH] x86: Remove spurious EFI error message

[PATCH] x86: Remove spurious EFI error message

[Matthew Garrett]

The EFI memory descriptor services can return a descriptor that is larger
than the specification, and right now we give a warning message in that
situation. This behaviour is permitted by the specification, so we should
just drop the warning.

Signed-off-by: Matthew Garrett <mjg@redhat.com>
---
 arch/x86/platform/efi/efi.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index 0fe27d7..a902448 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -448,10 +448,6 @@ void __init efi_init(void)
 		printk(KERN_ERR "Could not map the EFI memory map!\n");
 	memmap.map_end = memmap.map + (memmap.nr_map * memmap.desc_size);
 
-	if (memmap.desc_size != sizeof(efi_memory_desc_t))
-		printk(KERN_WARNING
-		  "Kernel-defined memdesc doesn't match the one from EFI!\n");
-
 	if (add_efi_memmap)
 		do_add_efi_memmap();
 
-- 
1.7.4.1

Re: [PATCH] x86: Remove spurious EFI error message

[Matt Fleming]

On Mon, 2011-03-28 at 08:27 -0400, Matthew Garrett wrote:
> The EFI memory descriptor services can return a descriptor that is larger
> than the specification, and right now we give a warning message in that
> situation. This behaviour is permitted by the specification, so we should
> just drop the warning.
> 
> Signed-off-by: Matthew Garrett <mjg@redhat.com>
> ---
>  arch/x86/platform/efi/efi.c |    4 ----
>  1 files changed, 0 insertions(+), 4 deletions(-)

Matthew, any plans on getting this merged?

-- 
Matt Fleming, Intel Open Source Technology Center