Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752956AbcD1KhE (ORCPT ); Thu, 28 Apr 2016 06:37:04 -0400 Received: from terminus.zytor.com ([198.137.202.10]:47682 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750867AbcD1KhC (ORCPT ); Thu, 28 Apr 2016 06:37:02 -0400 Date: Thu, 28 Apr 2016 03:36:00 -0700 From: tip-bot for Matt Fleming Message-ID: Cc: ard.biesheuvel@linaro.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, bp@alien8.de, bp@suse.de, mingo@kernel.org, matt@codeblueprint.co.uk, hpa@zytor.com, elliott@hpe.com, peterz@infradead.org Reply-To: bp@suse.de, bp@alien8.de, mingo@kernel.org, matt@codeblueprint.co.uk, elliott@hpe.com, peterz@infradead.org, hpa@zytor.com, tglx@linutronix.de, ard.biesheuvel@linaro.org, linux-kernel@vger.kernel.org In-Reply-To: <1461614832-17633-16-git-send-email-matt@codeblueprint.co.uk> References: <1461614832-17633-16-git-send-email-matt@codeblueprint.co.uk> To: linux-tip-commits@vger.kernel.org Subject: [tip:efi/core] x86/efi: Remove the always true EFI_DEBUG symbol Git-Commit-ID: c3c1c47f15b37a8492e630d1e9ab8ad576ee10e5 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1830 Lines: 56 Commit-ID: c3c1c47f15b37a8492e630d1e9ab8ad576ee10e5 Gitweb: http://git.kernel.org/tip/c3c1c47f15b37a8492e630d1e9ab8ad576ee10e5 Author: Matt Fleming AuthorDate: Mon, 25 Apr 2016 21:06:47 +0100 Committer: Ingo Molnar 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 Signed-off-by: Matt Fleming Acked-by: Borislav Petkov Cc: Ard Biesheuvel Cc: Borislav Petkov Cc: Peter Zijlstra Cc: Thomas Gleixner 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 --- 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 #include -#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)