Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a89b5eb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull EFI fix from Thomas Gleixner:
 "Downgrade the missing ESRT header printk to warning level and remove a
  useless error printk which just generates noise for no value"

* 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  efi/esrt: Cleanup bad memory map log messages
parents 4a6808f3 79a21d57

drivers/firmware/efi/efi.c

+0 −1
Original line number Diff line number Diff line
@@ -389,7 +389,6 @@ int __init efi_mem_desc_lookup(u64 phys_addr, efi_memory_desc_t *out_md) 
			return 0;

		}

	}

	pr_err_once("requested map not found.\n");

	return -ENOENT;

}

drivers/firmware/efi/esrt.c

+1 −1
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ void __init efi_esrt_init(void) 


	rc = efi_mem_desc_lookup(efi.esrt, &md);

	if (rc < 0) {

		pr_err("ESRT header is not in the memory map.\n");

		pr_warn("ESRT header is not in the memory map.\n");

		return;

	}