[tip:efi/core] x86/efi: Remove the always true EFI_DEBUG symbol

From: tip-bot for Matt Fleming
Date: Thu Apr 28 2016 - 06:37:09 EST


Commit-ID: c3c1c47f15b37a8492e630d1e9ab8ad576ee10e5
Gitweb: http://git.kernel.org/tip/c3c1c47f15b37a8492e630d1e9ab8ad576ee10e5
Author: Matt Fleming <matt@xxxxxxxxxxxxxxxxxxx>
AuthorDate: Mon, 25 Apr 2016 21:06:47 +0100
Committer: Ingo Molnar <mingo@xxxxxxxxxx>
CommitDate: Thu, 28 Apr 2016 11:33:56 +0200

x86/efi: Remove the always true EFI_DEBUG symbol

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@xxxxxxx>
Signed-off-by: Matt Fleming <matt@xxxxxxxxxxxxxxxxxxx>
Acked-by: Borislav Petkov <bp@xxxxxxx>
Cc: Ard Biesheuvel <ard.biesheuvel@xxxxxxxxxx>
Cc: Borislav Petkov <bp@xxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: linux-efi@xxxxxxxxxxxxxxx
Link: http://lkml.kernel.org/r/1461614832-17633-16-git-send-email-matt@xxxxxxxxxxxxxxxxxxx
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
---
arch/x86/platform/efi/efi.c | 4 ----
1 file changed, 4 deletions(-)

diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index dde46cd..f93545e 100644
--- 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)