x86/efi: Remove the always true EFI_DEBUG symbol

mfleming · Ingo Molnar · commit c3c1c47f15b3 · 2016-04-28T11:33:56.000+02:00
This symbol is always set which makes it useless. Additionally we have a kernel command-line switch, efi=debug, which actually controls the printing of the memory map. Reported-by: Robert Elliott <elliott@hpe.com> Signed-off-by: Matt Fleming <matt@codeblueprint.co.uk> Acked-by: Borislav Petkov <bp@suse.de> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> Cc: Borislav Petkov <bp@alien8.de> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linux-efi@vger.kernel.org Link: http://lkml.kernel.org/r/1461614832-17633-16-git-send-email-matt@codeblueprint.co.uk Signed-off-by: Ingo Molnar <mingo@kernel.org>
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
@@ -54,8 +54,6 @@
 #include <asm/rtc.h>
 #include <asm/uv/uv.h>
 
-#define EFI_DEBUG
-
 static struct efi efi_phys __initdata;
 static efi_system_table_t efi_systab __initdata;
 
@@ -222,7 +220,6 @@ int __init efi_memblock_x86_reserve_range(void)
 
 void __init efi_print_memmap(void)
 {
-#ifdef EFI_DEBUG
 	efi_memory_desc_t *md;
 	int i = 0;
 
@@ -235,7 +232,6 @@ void __init efi_print_memmap(void)
 			md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT) - 1,
 			(md->num_pages >> (20 - EFI_PAGE_SHIFT)));
 	}
-#endif  /*  EFI_DEBUG  */
 }
 
 void __init efi_unmap_memmap(void)

Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,6 @@`
`54`	`54`	`#include <asm/rtc.h>`
`55`	`55`	`#include <asm/uv/uv.h>`
`56`	`56`
`57`		`-#define EFI_DEBUG`
`58`		`-`
`59`	`57`	`static struct efi efi_phys __initdata;`
`60`	`58`	`static efi_system_table_t efi_systab __initdata;`
`61`	`59`
`@@ -222,7 +220,6 @@ int __init efi_memblock_x86_reserve_range(void)`
`222`	`220`
`223`	`221`	`void __init efi_print_memmap(void)`
`224`	`222`	`{`
`225`		`-#ifdef EFI_DEBUG`
`226`	`223`	`efi_memory_desc_t *md;`
`227`	`224`	`int i = 0;`
`228`	`225`
`@@ -235,7 +232,6 @@ void __init efi_print_memmap(void)`
`235`	`232`	`md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT) - 1,`
`236`	`233`	`(md->num_pages >> (20 - EFI_PAGE_SHIFT)));`
`237`	`234`	`}`
`238`		`-#endif /* EFI_DEBUG */`
`239`	`235`	`}`
`240`	`236`
`241`	`237`	`void __init efi_unmap_memmap(void)`