Skip to contentSkip to conversation

x86: Remove spurious EFI error message

PATCH In review Matthew Garrett 2 participants 2 messages Mar 28, 2011 – Dec 8, 2011

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86: Remove spurious EFI error message

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.

---
 arch/x86/platform/efi/efi.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
arch/x86/platform/efi/efi.c +0 -4
index 0fe27d7..a902448 100644
@@ -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();
 
Signature · 1 line
1.7.4.1
#1 lore raw
Quoted 9 lines · 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.

---
 arch/x86/platform/efi/efi.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

Matthew, any plans on getting this merged?

Signature · 1 line
Matt Fleming, Intel Open Source Technology Center