X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=arch%2Fx86%2Fplatform%2Fefi%2Fefi.c;h=e859d56ce9f88661963b9ff679cb3f7b8593c9c4;hb=fed6cefe3b6e862dcc74d07324478caa07e84eaf;hp=dbc8627a5cdf6d569a5f69cbea05ebac924d2279;hpb=552e19d8764aeea3ecdf6cf29e22d6b99a505091;p=deliverable%2Flinux.git

diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index dbc8627a5cdf..e859d56ce9f8 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -491,7 +491,8 @@ void __init efi_init(void)
 	if (efi_memmap_init())
 		return;
 
-	print_efi_memmap();
+	if (efi_enabled(EFI_DBG))
+		print_efi_memmap();
 }
 
 void __init efi_late_init(void)
@@ -939,6 +940,8 @@ static int __init arch_parse_efi_cmdline(char *str)
 {
 	if (parse_option_str(str, "old_map"))
 		set_bit(EFI_OLD_MEMMAP, &efi.flags);
+	if (parse_option_str(str, "debug"))
+		set_bit(EFI_DBG, &efi.flags);
 
 	return 0;
 }