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

torvalds · torvalds · commit 0a89b5eb818a · 2017-04-02T09:23:31.000-07:00
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
diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
@@ -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;
 }
 
diff --git a/drivers/firmware/efi/esrt.c b/drivers/firmware/efi/esrt.c
@@ -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;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -389,7 +389,6 @@ int __init efi_mem_desc_lookup(u64 phys_addr, efi_memory_desc_t *out_md)`
`389`	`389`	`return 0;`
`390`	`390`	`}`
`391`	`391`	`}`
`392`		`- pr_err_once("requested map not found.\n");`
`393`	`392`	`return -ENOENT;`
`394`	`393`	`}`
`395`	`394`
Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,7 @@ void __init efi_esrt_init(void)`
`254`	`254`
`255`	`255`	`rc = efi_mem_desc_lookup(efi.esrt, &md);`
`256`	`256`	`if (rc < 0) {`
`257`		`- pr_err("ESRT header is not in the memory map.\n");`
	`257`	`+ pr_warn("ESRT header is not in the memory map.\n");`
`258`	`258`	`return;`
`259`	`259`	`}`
`260`	`260`