linux-kernel - [tip:x86/uv] x86/platform/UV: Remove unnecessary #ifdef CONFIG

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <tip-30ad3e031d2feae075cd5fd2c443baa2d86c0195@git.kernel.org>
Date:   Fri, 15 Feb 2019 07:04:11 -0800
From:   tip-bot for Hedi Berriche <tipbot@...or.com>
To:     linux-tip-commits@...r.kernel.org
Cc:     linux-efi@...r.kernel.org, rja@....com, x86@...nel.org, bp@...e.de,
        ard.biesheuvel@...aro.org, sivanich@....com, mingo@...nel.org,
        mingo@...hat.com, dvhart@...radead.org, hpa@...or.com,
        tglx@...utronix.de, bhsharma@...hat.com, mike.travis@....com,
        steve.wahl@....com, linux-kernel@...r.kernel.org,
        andy@...radead.org, hedi.berriche@....com
Subject: [tip:x86/uv] x86/platform/UV: Remove unnecessary #ifdef CONFIG_EFI

Commit-ID:  30ad3e031d2feae075cd5fd2c443baa2d86c0195
Gitweb:     https://git.kernel.org/tip/30ad3e031d2feae075cd5fd2c443baa2d86c0195
Author:     Hedi Berriche <hedi.berriche@....com>
AuthorDate: Wed, 13 Feb 2019 19:34:10 +0000
Committer:  Borislav Petkov <bp@...e.de>
CommitDate: Fri, 15 Feb 2019 15:05:15 +0100

x86/platform/UV: Remove unnecessary #ifdef CONFIG_EFI

CONFIG_EFI is implied by CONFIG_X86_UV and x86/platform/uv/bios_uv.c
requires the latter, get rid of the redundant #ifdef CONFIG_EFI
directives.

Cleanup, no functional changes.

Signed-off-by: Hedi Berriche <hedi.berriche@....com>
Signed-off-by: Borislav Petkov <bp@...e.de>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@...aro.org>
Reviewed-by: Russ Anderson <rja@....com>
Reviewed-by: Dimitri Sivanich <sivanich@....com>
Reviewed-by: Mike Travis <mike.travis@....com>
Cc: Andy Shevchenko <andy@...radead.org>
Cc: Bhupesh Sharma <bhsharma@...hat.com>
Cc: Darren Hart <dvhart@...radead.org>
Cc: "H. Peter Anvin" <hpa@...or.com>
Cc: Ingo Molnar <mingo@...hat.com>
Cc: linux-efi <linux-efi@...r.kernel.org>
Cc: platform-driver-x86@...r.kernel.org
Cc: Steve Wahl <steve.wahl@....com>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: x86-ml <x86@...nel.org>
Link: https://lkml.kernel.org/r/20190213193413.25560-2-hedi.berriche@hpe.com
---
 arch/x86/include/asm/uv/bios.h | 4 ----
 arch/x86/platform/uv/bios_uv.c | 2 --
 2 files changed, 6 deletions(-)

diff --git a/arch/x86/include/asm/uv/bios.h b/arch/x86/include/asm/uv/bios.h
index e652a7cc6186..00d862cfbcbe 100644
--- a/arch/x86/include/asm/uv/bios.h
+++ b/arch/x86/include/asm/uv/bios.h
@@ -151,11 +151,7 @@ extern s64 uv_bios_change_memprotect(u64, u64, enum uv_memprotect);
 extern s64 uv_bios_reserved_page_pa(u64, u64 *, u64 *, u64 *);
 extern int uv_bios_set_legacy_vga_target(bool decode, int domain, int bus);
 
-#ifdef CONFIG_EFI
 extern void uv_bios_init(void);
-#else
-void uv_bios_init(void) { }
-#endif
 
 extern unsigned long sn_rtc_cycles_per_second;
 extern int uv_type;
diff --git a/arch/x86/platform/uv/bios_uv.c b/arch/x86/platform/uv/bios_uv.c
index 4a6a5a26c582..4a61ed2a7bb8 100644
--- a/arch/x86/platform/uv/bios_uv.c
+++ b/arch/x86/platform/uv/bios_uv.c
@@ -188,7 +188,6 @@ int uv_bios_set_legacy_vga_target(bool decode, int domain, int bus)
 }
 EXPORT_SYMBOL_GPL(uv_bios_set_legacy_vga_target);
 
-#ifdef CONFIG_EFI
 void uv_bios_init(void)
 {
 	uv_systab = NULL;
@@ -218,4 +217,3 @@ void uv_bios_init(void)
 	}
 	pr_info("UV: UVsystab: Revision:%x\n", uv_systab->revision);
 }
-#endif